Browse Source

zorro: 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: Geert Uytterhoeven <geert@linux-m68k.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>
Denis V. Lunev 17 years ago
parent
commit
659f865ea6
1 changed files with 4 additions and 3 deletions
  1. 4 3
      drivers/zorro/proc.c

+ 4 - 3
drivers/zorro/proc.c

@@ -77,6 +77,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 = {
 static const struct file_operations proc_bus_zorro_operations = {
+	.owner		= THIS_MODULE,
 	.llseek		= proc_bus_zorro_lseek,
 	.llseek		= proc_bus_zorro_lseek,
 	.read		= proc_bus_zorro_read,
 	.read		= proc_bus_zorro_read,
 };
 };
@@ -136,11 +137,11 @@ static int __init zorro_proc_attach_device(u_int slot)
 	char name[4];
 	char name[4];
 
 
 	sprintf(name, "%02x", slot);
 	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)
 	if (!entry)
 		return -ENOMEM;
 		return -ENOMEM;
-	entry->proc_fops = &proc_bus_zorro_operations;
-	entry->data = &zorro_autocon[slot];
 	entry->size = sizeof(struct zorro_dev);
 	entry->size = sizeof(struct zorro_dev);
 	return 0;
 	return 0;
 }
 }