mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-11-24 12:40:24 +00:00
proc: fix proc_kill_inodes to kill dentries on all proc superblocks
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:
parent
7105458563
commit
e1a1c997af
@ -561,14 +561,17 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
|
||||
static void proc_kill_inodes(struct proc_dir_entry *de)
|
||||
{
|
||||
struct list_head *p;
|
||||
struct super_block *sb = proc_mnt->mnt_sb;
|
||||
struct super_block *sb;
|
||||
|
||||
/*
|
||||
* Actually it's a partial revoke().
|
||||
*/
|
||||
spin_lock(&sb_lock);
|
||||
list_for_each_entry(sb, &proc_fs_type.fs_supers, s_instances) {
|
||||
file_list_lock();
|
||||
list_for_each(p, &sb->s_files) {
|
||||
struct file * filp = list_entry(p, struct file, f_u.fu_list);
|
||||
struct file *filp = list_entry(p, struct file,
|
||||
f_u.fu_list);
|
||||
struct dentry *dentry = filp->f_path.dentry;
|
||||
struct inode *inode;
|
||||
const struct file_operations *fops;
|
||||
@ -584,6 +587,8 @@ static void proc_kill_inodes(struct proc_dir_entry *de)
|
||||
}
|
||||
file_list_unlock();
|
||||
}
|
||||
spin_unlock(&sb_lock);
|
||||
}
|
||||
|
||||
static struct proc_dir_entry *proc_create(struct proc_dir_entry **parent,
|
||||
const char *name,
|
||||
|
@ -78,3 +78,5 @@ static inline int proc_fd(struct inode *inode)
|
||||
{
|
||||
return PROC_I(inode)->fd;
|
||||
}
|
||||
|
||||
extern struct file_system_type proc_fs_type;
|
||||
|
@ -98,7 +98,7 @@ static void proc_kill_sb(struct super_block *sb)
|
||||
put_pid_ns(ns);
|
||||
}
|
||||
|
||||
static struct file_system_type proc_fs_type = {
|
||||
struct file_system_type proc_fs_type = {
|
||||
.name = "proc",
|
||||
.get_sb = proc_get_sb,
|
||||
.kill_sb = proc_kill_sb,
|
||||
|
Loading…
Reference in New Issue
Block a user