On 08/23/2013 04:24 PM, Greg Kroah-Hartman wrote:
> The bus_attrs field of struct bus_type is going away soon, dev_groups
> should be used instead. This converts the RBD bus code to use the
> correct field.
>
> Cc: Yehuda Sadeh <yeh...@inktank.com>
> Cc: Sage Weil <s...@inktank.com>
> Cc: Alex Elder <el...@inktank.com>
Looks reasonable to me.
Acked-by: Alex Elder <el...@linaro.org>
> Cc: <ceph-de...@vger.kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> ---
> drivers/block/rbd.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 4ad2ad9a..191cd177 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -397,15 +397,19 @@ static ssize_t rbd_remove(struct bus_type *bus, const
> char *buf,
> static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);
> static void rbd_spec_put(struct rbd_spec *spec);
>
> -static struct bus_attribute rbd_bus_attrs[] = {
> - __ATTR(add, S_IWUSR, NULL, rbd_add),
> - __ATTR(remove, S_IWUSR, NULL, rbd_remove),
> - __ATTR_NULL
> +static BUS_ATTR(add, S_IWUSR, NULL, rbd_add);
> +static BUS_ATTR(remove, S_IWUSR, NULL, rbd_remove);
> +
> +static struct attribute *rbd_bus_attrs[] = {
> + &bus_attr_add.attr,
> + &bus_attr_remove.attr,
> + NULL,
> };
> +ATTRIBUTE_GROUPS(rbd_bus);
>
> static struct bus_type rbd_bus_type = {
> .name = "rbd",
> - .bus_attrs = rbd_bus_attrs,
> + .bus_groups = rbd_bus_groups,
> };
>
> static void rbd_root_dev_release(struct device *dev)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
