[PATCH 12/29] zorro: use non-racy method for proc entries creation

Denis V. Lunev
2008-04-08T11:22:41Z

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: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/zorro/proc.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index b7a8c7b..2de70fc 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -76,6 +76,7 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *
}

static const struct file_operations proc_bus_zorro_operations = {
+ .owner = THIS_MODULE,
.llseek = proc_bus_zorro_lseek,
.read = proc_bus_zorro_read,
};
@@ -114,11 +115,11 @@ static int __init zorro_proc_attach_device(u_int slot)
char name[4];

sprintf(name, "%02x", slot);
- entry = create_proc_entry(name, 0, proc_bus_zorro_dir);
+ entry = proc_create_data(name, 0, proc_bus_zorro_dir,
+ &proc_bus_zorro_operations,
+ &zorro_autocon[slot]);
if (!entry)
return -ENOMEM;
- entry->proc_fops = &proc_bus_zorro_operations;
- entry->data = &zorro_autocon[slot];
entry->size = sizeof(struct zorro_dev);
return 0;
}
--
1.5.3.rc5