diff --git a/[refs] b/[refs] index bd00f1638c82..1886a63248a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 730e908f3539066d4aa01f4720ebfc750ce4d045 +refs/heads/master: cf1279111686d9742cbc4145bc9d526c83f59fea diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 14def991d9dd..8a84210ca080 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/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))