| Message ID | 1377293081-10957-2-git-send-email-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <yehuda@inktank.com> > Cc: Sage Weil <sage@inktank.com> > Cc: Alex Elder <elder@inktank.com> Looks reasonable to me. Acked-by: Alex Elder <elder@linaro.org> > Cc: <ceph-devel@vger.kernel.org> > Signed-off-by: Greg Kroah-Hartman <gregkh@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 ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Aug 27, 2013 at 07:35:32AM -0500, Alex Elder wrote: > 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 <yehuda@inktank.com> > > Cc: Sage Weil <sage@inktank.com> > > Cc: Alex Elder <elder@inktank.com> > > Looks reasonable to me. > > Acked-by: Alex Elder <elder@linaro.org> Thanks for the review. greg k-h -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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 <yehuda@inktank.com> Cc: Sage Weil <sage@inktank.com> Cc: Alex Elder <elder@inktank.com> Cc: <ceph-devel@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/block/rbd.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)