diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:09:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:09:52 -0700 |
| commit | 51347e968c062c4041dd5317122ab573f06b889b (patch) | |
| tree | 9a3e770e13b1ed3a33db897c78c8c3cd89b3b151 /rbd-convert-bus-code-to-use-bus_groups.patch | |
| parent | bbcc0c699929d3b01ecf3066a35799defe733dd2 (diff) | |
| download | patches-51347e968c062c4041dd5317122ab573f06b889b.tar.gz | |
more patches upstream removed
Diffstat (limited to 'rbd-convert-bus-code-to-use-bus_groups.patch')
| -rw-r--r-- | rbd-convert-bus-code-to-use-bus_groups.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/rbd-convert-bus-code-to-use-bus_groups.patch b/rbd-convert-bus-code-to-use-bus_groups.patch deleted file mode 100644 index 788c1bf82336dd..00000000000000 --- a/rbd-convert-bus-code-to-use-bus_groups.patch +++ /dev/null @@ -1,46 +0,0 @@ -From foo@baz Fri Aug 23 13:16:26 PDT 2013 -Date: Fri, 23 Aug 2013 13:16:26 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: 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> -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(-) - ---- a/drivers/block/rbd.c -+++ b/drivers/block/rbd.c -@@ -397,15 +397,19 @@ static ssize_t rbd_remove(struct bus_typ - 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) |