diff options
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 72391b3f6927..e6d7f41b6684 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -702,25 +702,22 @@ out: | |||
702 | 702 | ||
703 | static int children_seq_show(struct seq_file *seq, void *v) | 703 | static int children_seq_show(struct seq_file *seq, void *v) |
704 | { | 704 | { |
705 | struct inode *inode = seq->private; | 705 | struct inode *inode = file_inode(seq->file); |
706 | pid_t pid; | ||
707 | |||
708 | pid = pid_nr_ns(v, inode->i_sb->s_fs_info); | ||
709 | seq_printf(seq, "%d ", pid); | ||
710 | 706 | ||
707 | seq_printf(seq, "%d ", pid_nr_ns(v, proc_pid_ns(inode))); | ||
711 | return 0; | 708 | return 0; |
712 | } | 709 | } |
713 | 710 | ||
714 | static void *children_seq_start(struct seq_file *seq, loff_t *pos) | 711 | static void *children_seq_start(struct seq_file *seq, loff_t *pos) |
715 | { | 712 | { |
716 | return get_children_pid(seq->private, NULL, *pos); | 713 | return get_children_pid(file_inode(seq->file), NULL, *pos); |
717 | } | 714 | } |
718 | 715 | ||
719 | static void *children_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 716 | static void *children_seq_next(struct seq_file *seq, void *v, loff_t *pos) |
720 | { | 717 | { |
721 | struct pid *pid; | 718 | struct pid *pid; |
722 | 719 | ||
723 | pid = get_children_pid(seq->private, v, *pos + 1); | 720 | pid = get_children_pid(file_inode(seq->file), v, *pos + 1); |
724 | put_pid(v); | 721 | put_pid(v); |
725 | 722 | ||
726 | ++*pos; | 723 | ++*pos; |
@@ -741,17 +738,7 @@ static const struct seq_operations children_seq_ops = { | |||
741 | 738 | ||
742 | static int children_seq_open(struct inode *inode, struct file *file) | 739 | static int children_seq_open(struct inode *inode, struct file *file) |
743 | { | 740 | { |
744 | struct seq_file *m; | 741 | return seq_open(file, &children_seq_ops); |
745 | int ret; | ||
746 | |||
747 | ret = seq_open(file, &children_seq_ops); | ||
748 | if (ret) | ||
749 | return ret; | ||
750 | |||
751 | m = file->private_data; | ||
752 | m->private = inode; | ||
753 | |||
754 | return ret; | ||
755 | } | 742 | } |
756 | 743 | ||
757 | const struct file_operations proc_tid_children_operations = { | 744 | const struct file_operations proc_tid_children_operations = { |