aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
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/dir.c
parent2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 (diff)
->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/dir.c')
-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 16cf84b4afb..a86acd6d0cb 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)
2273 return nfs_do_access(inode, cred, nfs_open_permission_mask(openflags)); 2273 return nfs_do_access(inode, cred, nfs_open_permission_mask(openflags));
2274} 2274}
2275 2275
2276int nfs_permission(struct inode *inode, int mask, unsigned int flags) 2276int nfs_permission(struct inode *inode, int mask)
2277{ 2277{
2278 struct rpc_cred *cred; 2278 struct rpc_cred *cred;
2279 int res = 0; 2279 int res = 0;
2280 2280
2281 if (flags & IPERM_FLAG_RCU) 2281 if (mask & MAY_NOT_BLOCK)
2282 return -ECHILD; 2282 return -ECHILD;
2283 2283
2284 nfs_inc_stats(inode, NFSIOS_VFSACCESS); 2284 nfs_inc_stats(inode, NFSIOS_VFSACCESS);