Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[~andy/linux] / fs / afs / security.c

diff --git a/fs/afs/security.c b/fs/afs/security.c
index f44b9d35537713c4bba6013e74be36013f2cca6e..8d010422dc8962b72fb3af64f75fdedb8e892cc0 100644 (file)
--- a/fs/afs/security.c
+++ b/fs/afs/security.c
@@ -285,14 +285,14 @@ static int afs_check_permit(struct afs_vnode *vnode, struct key *key,
  * - AFS ACLs are attached to directories only, and a file is controlled by its
  *   parent directory's ACL
  */
-int afs_permission(struct inode *inode, int mask, unsigned int flags)
+int afs_permission(struct inode *inode, int mask)
 {
        struct afs_vnode *vnode = AFS_FS_I(inode);
        afs_access_t uninitialized_var(access);
        struct key *key;
        int ret;
 
-       if (flags & IPERM_FLAG_RCU)
+       if (mask & MAY_NOT_BLOCK)
                return -ECHILD;
 
        _enter("{{%x:%u},%lx},%x,",
@@ -350,7 +350,7 @@ int afs_permission(struct inode *inode, int mask, unsigned int flags)
        }
 
        key_put(key);
-       ret = generic_permission(inode, mask, flags, NULL);
+       ret = generic_permission(inode, mask);
        _leave(" = %d", ret);
        return ret;