aboutsummaryrefslogtreecommitdiff
path: root/fs/afs/security.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/afs/security.c')
-rw-r--r--fs/afs/security.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/afs/security.c b/fs/afs/security.c
index bb4ed144d0e..8d010422dc8 100644
--- a/fs/afs/security.c
+++ b/fs/afs/security.c
@@ -292,6 +292,9 @@ int afs_permission(struct inode *inode, int mask)
struct key *key;
int ret;
+ if (mask & MAY_NOT_BLOCK)
+ return -ECHILD;
+
_enter("{{%x:%u},%lx},%x,",
vnode->fid.vid, vnode->fid.vnode, vnode->flags, mask);
@@ -347,7 +350,7 @@ int afs_permission(struct inode *inode, int mask)
}
key_put(key);
- ret = generic_permission(inode, mask, NULL);
+ ret = generic_permission(inode, mask);
_leave(" = %d", ret);
return ret;