Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

proc: fix proc_kill_inodes to kill dentries on all proc superblocks

Browse source 
It appears we overlooked support for removing generic proc files
when we added support for multiple proc super blocks.  Handle
that now.

[akpm@linux-foundation.org: coding-style cleanups]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Alexey Dobriyan <adobriyan@sw.ru>
Acked-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Eric W. Biederman 2007-11-14 16:59:08 -08:00 committed by Linus Torvalds
parent 7105458563
commit e1a1c997af
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
fs/proc/generic.c
View file

@ -561,28 +561,33 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
static void proc_kill_inodes(struct proc_dir_entry *de) static void proc_kill_inodes(struct proc_dir_entry *de)
{ {
struct list_head *p; struct list_head *p;
struct super_block *sb = proc_mnt->mnt_sb; struct super_block *sb;
/* /*
* Actually it's a partial revoke(). * Actually it's a partial revoke().
*/ */
file_list_lock(); spin_lock(&sb_lock);
list_for_each(p, &sb->s_files) { list_for_each_entry(sb, &proc_fs_type.fs_supers, s_instances) {
struct file * filp = list_entry(p, struct file, f_u.fu_list); file_list_lock();
struct dentry * dentry = filp->f_path.dentry; list_for_each(p, &sb->s_files) {
struct inode * inode; struct file *filp = list_entry(p, struct file,
const struct file_operations *fops; f_u.fu_list);
struct dentry *dentry = filp->f_path.dentry;
struct inode *inode;
const struct file_operations *fops;
if (dentry->d_op != &proc_dentry_operations) if (dentry->d_op != &proc_dentry_operations)
continue; continue;
inode = dentry->d_inode; inode = dentry->d_inode;
if (PDE(inode) != de) if (PDE(inode) != de)
continue; continue;
fops = filp->f_op; fops = filp->f_op;
filp->f_op = NULL; filp->f_op = NULL;
fops_put(fops); fops_put(fops);
}
file_list_unlock();
} }
file_list_unlock(); spin_unlock(&sb_lock);
} }
static struct proc_dir_entry *proc_create(struct proc_dir_entry **parent, static struct proc_dir_entry *proc_create(struct proc_dir_entry **parent,

2
fs/proc/internal.h
View file

@ -78,3 +78,5 @@ static inline int proc_fd(struct inode *inode)
{ {
return PROC_I(inode)->fd; return PROC_I(inode)->fd;
} }
extern struct file_system_type proc_fs_type;

2
fs/proc/root.c
View file

@ -98,7 +98,7 @@ static void proc_kill_sb(struct super_block *sb)
put_pid_ns(ns); put_pid_ns(ns);
} }
static struct file_system_type proc_fs_type = { struct file_system_type proc_fs_type = {
.name = "proc", .name = "proc",
.get_sb = proc_get_sb, .get_sb = proc_get_sb,
.kill_sb = proc_kill_sb, .kill_sb = proc_kill_sb,