summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/acl.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:06:22 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:19 -0400
commit9c2c703929e4c41210cfa6e3f599514421bab8dc (patch)
tree2086738f22755ad18ba18ab2ee0f2b23d651da60 /fs/btrfs/acl.c
parent1fc0f78ca9f311c6277e2f1b7655bb4d43ceb311 (diff)
downloadop-kernel-dev-9c2c703929e4c41210cfa6e3f599514421bab8dc.zip
op-kernel-dev-9c2c703929e4c41210cfa6e3f599514421bab8dc.tar.gz
->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/acl.c')
-rw-r--r--fs/btrfs/acl.c3
1 files changed, 1 insertions, 2 deletions
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 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);
OpenPOWER on IntegriCloud