| commit | 9c2c703929e4c41210cfa6e3f599514421bab8dc | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Mon Jun 20 19:06:22 2011 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Wed Jul 20 01:43:19 2011 -0400 |
| tree | 2086738f22755ad18ba18ab2ee0f2b23d651da60 | |
| parent | 1fc0f78ca9f311c6277e2f1b7655bb4d43ceb311 [diff] |
->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index f66fc99..a25a4a2 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c
@@ -199,10 +199,9 @@ { 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);