summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJerome Marchand <jmarchan@redhat.com>2010-04-27 13:13:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-27 16:26:03 -0700
commit3835541dd481091c4dbf5ef83c08aed12e50fd61 (patch)
treebb40567215e394392ed0167867a0bf2a5916a583 /fs
parent9e584fbbd9fd4f0f10b8aafc9982df8d0b553e35 (diff)
downloadlinux-3.10-3835541dd481091c4dbf5ef83c08aed12e50fd61.tar.gz
linux-3.10-3835541dd481091c4dbf5ef83c08aed12e50fd61.tar.bz2
linux-3.10-3835541dd481091c4dbf5ef83c08aed12e50fd61.zip
procfs: fix tid fdinfo
Correct the file_operations struct in fdinfo entry of tid_base_stuff[]. Presently /proc/*/task/*/fdinfo contains symlinks to opened files like /proc/*/fd/. Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Miklos Szeredi <mszeredi@suse.cz> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 7621db800a7..8418fcc0a6a 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2909,7 +2909,7 @@ out_no_task:
*/
static const struct pid_entry tid_base_stuff[] = {
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
- DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fd_operations),
+ DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations),
REG("environ", S_IRUSR, proc_environ_operations),
INF("auxv", S_IRUSR, proc_pid_auxv),
ONE("status", S_IRUGO, proc_pid_status),