diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-29 04:02:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:22 -0400 |
commit | cf7acfab032ff262f42954328cdfd20a5d9aaaac (patch) | |
tree | 231698d72d4508f3b26f606f18ef844387ec43e5 /drivers/acpi/fan.c | |
parent | 667471386d4068e75a6a55b615701ced61eb6333 (diff) |
acpi: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Add correct ->owner to proc_fops to fix reading/module unloading race.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi/fan.c')
-rw-r--r-- | drivers/acpi/fan.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index c8e3cba423ef..194077ab9b85 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
@@ -192,17 +192,13 @@ static int acpi_fan_add_fs(struct acpi_device *device) | |||
192 | } | 192 | } |
193 | 193 | ||
194 | /* 'status' [R/W] */ | 194 | /* 'status' [R/W] */ |
195 | entry = create_proc_entry(ACPI_FAN_FILE_STATE, | 195 | entry = proc_create_data(ACPI_FAN_FILE_STATE, |
196 | S_IFREG | S_IRUGO | S_IWUSR, | 196 | S_IFREG | S_IRUGO | S_IWUSR, |
197 | acpi_device_dir(device)); | 197 | acpi_device_dir(device), |
198 | &acpi_fan_state_ops, | ||
199 | device); | ||
198 | if (!entry) | 200 | if (!entry) |
199 | return -ENODEV; | 201 | return -ENODEV; |
200 | else { | ||
201 | entry->proc_fops = &acpi_fan_state_ops; | ||
202 | entry->data = device; | ||
203 | entry->owner = THIS_MODULE; | ||
204 | } | ||
205 | |||
206 | return 0; | 202 | return 0; |
207 | } | 203 | } |
208 | 204 | ||