---

yaml --- r: 262651 b: refs/heads/master c: 206b1d0 h: refs/heads/master i: 262649: a701a8a 262647: 8bc5aff v: v3
git-mirror · Aug 7, 2011 · 3343a8a · 3343a8a
1 parent 01b1377
commit 3343a8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2f340a69cabe0fb7b9f02d1a2495927db225a06
+refs/heads/master: 206b1d09a56dcd2db1052245c4131879c410eaf8
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -186,7 +186,7 @@ static int check_acl(struct inode *inode, int mask)
 		/* no ->get_acl() calls in RCU mode... */
 		if (acl == ACL_NOT_CACHED)
 			return -ECHILD;
-	        return posix_acl_permission(inode, acl, mask);
+	        return posix_acl_permission(inode, acl, mask & ~MAY_NOT_BLOCK);
 	}
 
 	acl = get_cached_acl(inode, ACL_TYPE_ACCESS);