diff options
Diffstat (limited to 'fs/btrfs/acl.c')
-rw-r--r-- | fs/btrfs/acl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index f66fc9959733..9f62ab2a7282 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c | |||
@@ -195,14 +195,13 @@ out: | |||
195 | return ret; | 195 | return ret; |
196 | } | 196 | } |
197 | 197 | ||
198 | int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags) | 198 | int btrfs_check_acl(struct inode *inode, int mask) |
199 | { | 199 | { |
200 | int error = -EAGAIN; | 200 | int error = -EAGAIN; |
201 | 201 | ||
202 | if (flags & IPERM_FLAG_RCU) { | 202 | if (mask & MAY_NOT_BLOCK) { |
203 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) | 203 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) |
204 | error = -ECHILD; | 204 | error = -ECHILD; |
205 | |||
206 | } else { | 205 | } else { |
207 | struct posix_acl *acl; | 206 | struct posix_acl *acl; |
208 | acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS); | 207 | acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS); |