Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 72391b3f6927716ea15de244a6fc1d2cdea8b4a5..e6d7f41b66845af42f51fe442fee288152161870 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -702,25 +702,22 @@ out:
 
 static int children_seq_show(struct seq_file *seq, void *v)
 {
-       struct inode *inode = seq->private;
-       pid_t pid;
-
-       pid = pid_nr_ns(v, inode->i_sb->s_fs_info);
-       seq_printf(seq, "%d ", pid);
+       struct inode *inode = file_inode(seq->file);
 
+       seq_printf(seq, "%d ", pid_nr_ns(v, proc_pid_ns(inode)));
        return 0;
 }
 
 static void *children_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       return get_children_pid(seq->private, NULL, *pos);
+       return get_children_pid(file_inode(seq->file), NULL, *pos);
 }
 
 static void *children_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct pid *pid;
 
-       pid = get_children_pid(seq->private, v, *pos + 1);
+       pid = get_children_pid(file_inode(seq->file), v, *pos + 1);
        put_pid(v);
 
        ++*pos;
@@ -741,17 +738,7 @@ static const struct seq_operations children_seq_ops = {
 
 static int children_seq_open(struct inode *inode, struct file *file)
 {
-       struct seq_file *m;
-       int ret;
-
-       ret = seq_open(file, &children_seq_ops);
-       if (ret)
-               return ret;
-
-       m = file->private_data;
-       m->private = inode;
-
-       return ret;
+       return seq_open(file, &children_seq_ops);
 }
 
 const struct file_operations proc_tid_children_operations = {