diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-10 17:02:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-10 17:02:41 -0700 |
| commit | e96e039272610e5716f4cccb31b7ceb9c4a4c44c (patch) | |
| tree | bfeafc2e2a602106d27bdbc53e5869422bcf8f46 /f2.patch | |
| parent | 71dc29f11ecf9b2d046caa36ae09f233b6fbcb8c (diff) | |
| download | patches-e96e039272610e5716f4cccb31b7ceb9c4a4c44c.tar.gz | |
updates
Diffstat (limited to 'f2.patch')
| -rw-r--r-- | f2.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/f2.patch b/f2.patch new file mode 100644 index 00000000000000..e403b42486b5f1 --- /dev/null +++ b/f2.patch @@ -0,0 +1,82 @@ +--- + drivers/block/rbd.c | 14 +++++++++----- + drivers/pci/pci-driver.c | 2 +- + drivers/pci/pci-sysfs.c | 16 +++++++++++++--- + drivers/pci/pci.h | 2 +- + 4 files changed, 24 insertions(+), 10 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) +--- a/drivers/pci/pci-driver.c ++++ b/drivers/pci/pci-driver.c +@@ -1274,7 +1274,7 @@ struct bus_type pci_bus_type = { + .remove = pci_device_remove, + .shutdown = pci_device_shutdown, + .dev_attrs = pci_dev_attrs, +- .bus_attrs = pci_bus_attrs, ++ .bus_groups = pci_bus_groups, + .drv_attrs = pci_drv_attrs, + .pm = PCI_PM_OPS_PTR, + }; +--- a/drivers/pci/pci-sysfs.c ++++ b/drivers/pci/pci-sysfs.c +@@ -302,10 +302,20 @@ static ssize_t bus_rescan_store(struct b + } + return count; + } ++static BUS_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store); + +-struct bus_attribute pci_bus_attrs[] = { +- __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store), +- __ATTR_NULL ++struct attribute *pci_bus_attrs[] = { ++ &bus_attr_rescan.attr, ++ NULL, ++}; ++ ++static const struct attribute_group pci_bus_group = { ++ .attrs = pci_bus_attrs, ++}; ++ ++const struct attribute_group *pci_bus_groups[] = { ++ &pci_bus_group, ++ NULL, + }; + + static ssize_t +--- a/drivers/pci/pci.h ++++ b/drivers/pci/pci.h +@@ -153,7 +153,7 @@ static inline int pci_no_d1d2(struct pci + extern struct device_attribute pci_dev_attrs[]; + extern const struct attribute_group *pcibus_groups[]; + extern struct device_type pci_dev_type; +-extern struct bus_attribute pci_bus_attrs[]; ++extern const struct attribute_group *pci_bus_groups[]; + + + /** |