summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-18 20:35:23 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-06-20 10:44:50 -0400
commitcf1279111686d9742cbc4145bc9d526c83f59fea (patch)
tree3247223a8bef912896418bd07475cec2658fc212 /fs/proc
parent730e908f3539066d4aa01f4720ebfc750ce4d045 (diff)
downloadlinux-3.10-cf1279111686d9742cbc4145bc9d526c83f59fea.tar.gz
linux-3.10-cf1279111686d9742cbc4145bc9d526c83f59fea.tar.bz2
linux-3.10-cf1279111686d9742cbc4145bc9d526c83f59fea.zip
proc_fd_permission() is doesn't need to bail out in RCU mode
nothing blocking except generic_permission() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/base.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 14def991d9d..8a84210ca08 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2169,11 +2169,7 @@ static const struct file_operations proc_fd_operations = {
*/
static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags)
{
- int rv;
-
- if (flags & IPERM_FLAG_RCU)
- return -ECHILD;
- rv = generic_permission(inode, mask, flags, NULL);
+ int rv = generic_permission(inode, mask, flags, NULL);
if (rv == 0)
return 0;
if (task_pid(current) == proc_pid(inode))