->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl()

[linux-2.6-block.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index f66fc99597331383890ac4847329faf6a494ddb0..a25a4a2e0df21206b75cb355465c5cbd78851f2c 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -199,10 +199,9 @@ int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
 {
        int error = -EAGAIN;
 
-       if (flags & IPERM_FLAG_RCU) {
+       if (mask & MAY_NOT_BLOCK) {
                if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))
                        error = -ECHILD;
-
        } else {
                struct posix_acl *acl;
                acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);