hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: convert bus code to use bus_groups 

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>
Acked-by: Alex Elder <elder@linaro.org>
Cc: <ceph-devel@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-23 14:24:28 -07:00
parent 4c33dea781
commit b15a21ddda
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/rbd.c
View File

@ -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 int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);
static void rbd_spec_put(struct rbd_spec *spec); static void rbd_spec_put(struct rbd_spec *spec);
static struct bus_attribute rbd_bus_attrs[] = { static BUS_ATTR(add, S_IWUSR, NULL, rbd_add);
__ATTR(add, S_IWUSR, NULL, rbd_add), static BUS_ATTR(remove, S_IWUSR, NULL, rbd_remove);
__ATTR(remove, S_IWUSR, NULL, rbd_remove),
__ATTR_NULL 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 = { static struct bus_type rbd_bus_type = {
.name = "rbd", .name = "rbd",
.bus_attrs = rbd_bus_attrs, .bus_groups = rbd_bus_groups,
}; };
static void rbd_root_dev_release(struct device *dev) static void rbd_root_dev_release(struct device *dev)