From 3343a8ae6466d8dadc20ed589d2066259ddea41e Mon Sep 17 00:00:00 2001
From: Ari Savolainen <ari.m.savolainen@gmail.com>
Date: Sat, 6 Aug 2011 19:43:07 +0300
Subject: [PATCH] --- yaml --- r: 262651 b: refs/heads/master c:
 206b1d09a56dcd2db1052245c4131879c410eaf8 h: refs/heads/master i:   262649:
 a701a8ac4b73dcd449860faffbd565ea43f8a583   262647:
 8bc5aff3964b1649be103dd71933dd821b70bf1e v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1fcdb71dcdd8..4a743c8f80a7 100644
--- 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
index 4a98bf154d88..fc13609a354a 100644
--- 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);