Commit 4b998d4f6e559fb8eba8141263b2fddc9556391b

Authored by Eric W. Biederman
Committed by Linus Torvalds
1 parent 208367eeec

[PATCH] sysctl: cdrom: don't set de->owner

There is no need for open files in /proc/sys/XXX to hold a reference count on
the module that provides the file to prevent module unload races.  While there
is code active in the module p->used in the sysctl_table_header is
incremented, preventing the sysctl from being unregisted.  Once the sysctl is
unregistered it cannot be found.  Open files are also not a problem as they
revalidate the sysctl information and bump p->used before accessing module
code.

So setting de->owner is unnecessary, makes for a bad example and gets in my
way of removing ctl_table->de.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Acked-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff

drivers/cdrom/cdrom.c
... ... @@ -3554,8 +3554,6 @@
3554 3554 return;
3555 3555  
3556 3556 cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 0);
3557   - if (cdrom_root_table->ctl_name && cdrom_root_table->child->de)
3558   - cdrom_root_table->child->de->owner = THIS_MODULE;
3559 3557  
3560 3558 /* set the defaults */
3561 3559 cdrom_sysctl_settings.autoclose = autoclose;