diff options
author | Tejun Heo <htejun@gmail.com> | 2007-06-13 14:45:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-11 19:09:06 -0400 |
commit | 7b595756ec1f49e0049a9e01a1298d53a7faaa15 (patch) | |
tree | cd06687ab3e5c7a5a4ef91903dff207a18c4db76 /drivers/firmware | |
parent | dbde0fcf9f8f6d477af3c32d9979e789ee680cde (diff) |
sysfs: kill unnecessary attribute->owner
sysfs is now completely out of driver/module lifetime game. After
deletion, a sysfs node doesn't access anything outside sysfs proper,
so there's no reason to hold onto the attribute owners. Note that
often the wrong modules were accounted for as owners leading to
accessing removed modules.
This patch kills now unnecessary attribute->owner. Note that with
this change, userland holding a sysfs node does not prevent the
backing module from being unloaded.
For more info regarding lifetime rule cleanup, please read the
following message.
http://article.gmane.org/gmane.linux.kernel/510293
(tweaked by Greg to not delete the field just yet, to make it easier to
merge things properly.)
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/firmware')
-rw-r--r-- | drivers/firmware/dcdbas.h | 3 | ||||
-rw-r--r-- | drivers/firmware/dell_rbu.c | 6 | ||||
-rw-r--r-- | drivers/firmware/edd.c | 2 | ||||
-rw-r--r-- | drivers/firmware/efivars.c | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/drivers/firmware/dcdbas.h b/drivers/firmware/dcdbas.h index 58a85182b3e8..dcdba0f1b32c 100644 --- a/drivers/firmware/dcdbas.h +++ b/drivers/firmware/dcdbas.h | |||
@@ -67,8 +67,7 @@ | |||
67 | #define DCDBAS_BIN_ATTR_RW(_name) \ | 67 | #define DCDBAS_BIN_ATTR_RW(_name) \ |
68 | struct bin_attribute bin_attr_##_name = { \ | 68 | struct bin_attribute bin_attr_##_name = { \ |
69 | .attr = { .name = __stringify(_name), \ | 69 | .attr = { .name = __stringify(_name), \ |
70 | .mode = 0600, \ | 70 | .mode = 0600 }, \ |
71 | .owner = THIS_MODULE }, \ | ||
72 | .read = _name##_read, \ | 71 | .read = _name##_read, \ |
73 | .write = _name##_write, \ | 72 | .write = _name##_write, \ |
74 | } | 73 | } |
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index fc702e40bd43..f8afecb7d0cf 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
@@ -687,18 +687,18 @@ static ssize_t write_rbu_packet_size(struct kobject *kobj, char *buffer, | |||
687 | } | 687 | } |
688 | 688 | ||
689 | static struct bin_attribute rbu_data_attr = { | 689 | static struct bin_attribute rbu_data_attr = { |
690 | .attr = {.name = "data",.owner = THIS_MODULE,.mode = 0444}, | 690 | .attr = {.name = "data", .mode = 0444}, |
691 | .read = read_rbu_data, | 691 | .read = read_rbu_data, |
692 | }; | 692 | }; |
693 | 693 | ||
694 | static struct bin_attribute rbu_image_type_attr = { | 694 | static struct bin_attribute rbu_image_type_attr = { |
695 | .attr = {.name = "image_type",.owner = THIS_MODULE,.mode = 0644}, | 695 | .attr = {.name = "image_type", .mode = 0644}, |
696 | .read = read_rbu_image_type, | 696 | .read = read_rbu_image_type, |
697 | .write = write_rbu_image_type, | 697 | .write = write_rbu_image_type, |
698 | }; | 698 | }; |
699 | 699 | ||
700 | static struct bin_attribute rbu_packet_size_attr = { | 700 | static struct bin_attribute rbu_packet_size_attr = { |
701 | .attr = {.name = "packet_size",.owner = THIS_MODULE,.mode = 0644}, | 701 | .attr = {.name = "packet_size", .mode = 0644}, |
702 | .read = read_rbu_packet_size, | 702 | .read = read_rbu_packet_size, |
703 | .write = write_rbu_packet_size, | 703 | .write = write_rbu_packet_size, |
704 | }; | 704 | }; |
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index d8806e4f1829..15232271d848 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c | |||
@@ -74,7 +74,7 @@ static struct edd_device *edd_devices[EDD_MBR_SIG_MAX]; | |||
74 | 74 | ||
75 | #define EDD_DEVICE_ATTR(_name,_mode,_show,_test) \ | 75 | #define EDD_DEVICE_ATTR(_name,_mode,_show,_test) \ |
76 | struct edd_attribute edd_attr_##_name = { \ | 76 | struct edd_attribute edd_attr_##_name = { \ |
77 | .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE }, \ | 77 | .attr = {.name = __stringify(_name), .mode = _mode }, \ |
78 | .show = _show, \ | 78 | .show = _show, \ |
79 | .test = _test, \ | 79 | .test = _test, \ |
80 | }; | 80 | }; |
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 1324984a4c35..bfd2d67df689 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
@@ -131,21 +131,21 @@ struct efivar_attribute { | |||
131 | 131 | ||
132 | #define EFI_ATTR(_name, _mode, _show, _store) \ | 132 | #define EFI_ATTR(_name, _mode, _show, _store) \ |
133 | struct subsys_attribute efi_attr_##_name = { \ | 133 | struct subsys_attribute efi_attr_##_name = { \ |
134 | .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \ | 134 | .attr = {.name = __stringify(_name), .mode = _mode}, \ |
135 | .show = _show, \ | 135 | .show = _show, \ |
136 | .store = _store, \ | 136 | .store = _store, \ |
137 | }; | 137 | }; |
138 | 138 | ||
139 | #define EFIVAR_ATTR(_name, _mode, _show, _store) \ | 139 | #define EFIVAR_ATTR(_name, _mode, _show, _store) \ |
140 | struct efivar_attribute efivar_attr_##_name = { \ | 140 | struct efivar_attribute efivar_attr_##_name = { \ |
141 | .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \ | 141 | .attr = {.name = __stringify(_name), .mode = _mode}, \ |
142 | .show = _show, \ | 142 | .show = _show, \ |
143 | .store = _store, \ | 143 | .store = _store, \ |
144 | }; | 144 | }; |
145 | 145 | ||
146 | #define VAR_SUBSYS_ATTR(_name, _mode, _show, _store) \ | 146 | #define VAR_SUBSYS_ATTR(_name, _mode, _show, _store) \ |
147 | struct subsys_attribute var_subsys_attr_##_name = { \ | 147 | struct subsys_attribute var_subsys_attr_##_name = { \ |
148 | .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \ | 148 | .attr = {.name = __stringify(_name), .mode = _mode}, \ |
149 | .show = _show, \ | 149 | .show = _show, \ |
150 | .store = _store, \ | 150 | .store = _store, \ |
151 | }; | 151 | }; |