summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-20 19:28:19 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:24 -0400
commit10556cb21a0d0b24d95f00ea6df16f599a3345b2 (patch)
tree3d7d8dfba807805a55c154f1850717bf3b49f343 /fs/nfs
parent2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 (diff)
downloadop-kernel-dev-10556cb21a0d0b24d95f00ea6df16f599a3345b2.zip
op-kernel-dev-10556cb21a0d0b24d95f00ea6df16f599a3345b2.tar.gz
->permission() sanitizing: don't pass flags to ->permission()
not used by the instances anymore. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 16cf84b..a86acd6 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2273,12 +2273,12 @@ int nfs_may_open(struct inode *inode, struct rpc_cred *cred, int openflags)
return nfs_do_access(inode, cred, nfs_open_permission_mask(openflags));
}
-int nfs_permission(struct inode *inode, int mask, unsigned int flags)
+int nfs_permission(struct inode *inode, int mask)
{
struct rpc_cred *cred;
int res = 0;
- if (flags & IPERM_FLAG_RCU)
+ if (mask & MAY_NOT_BLOCK)
return -ECHILD;
nfs_inc_stats(inode, NFSIOS_VFSACCESS);
OpenPOWER on IntegriCloud