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);