---

yaml --- r: 253838 b: refs/heads/master c: cf12791 h: refs/heads/master v: v3
git-mirror · Jun 20, 2011 · 415ef68 · 415ef68
1 parent be9987b
commit 415ef68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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))