aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-06-10 17:13:09 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 08:34:32 -0400
commit00cd8dd3bf95f2cc8435b4cac01d9995635c6d0b (patch)
treed44be476ced0317ae79f28853734ebe2210ad38e /fs/nfs
parent201f956e43d4542723514e024d948011dd766d43 (diff)
stop passing nameidata to ->lookup()
Just the flags; only NFS cares even about that, but there are legitimate uses for such argument. And getting rid of that completely would require splitting ->lookup() into a couple of methods (at least), so let's leave that alone for now... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 656f52e9aa2e..8f21205c5896 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -46,7 +46,7 @@
46static int nfs_opendir(struct inode *, struct file *); 46static int nfs_opendir(struct inode *, struct file *);
47static int nfs_closedir(struct inode *, struct file *); 47static int nfs_closedir(struct inode *, struct file *);
48static int nfs_readdir(struct file *, void *, filldir_t); 48static int nfs_readdir(struct file *, void *, filldir_t);
49static struct dentry *nfs_lookup(struct inode *, struct dentry *, struct nameidata *); 49static struct dentry *nfs_lookup(struct inode *, struct dentry *, unsigned int);
50static int nfs_create(struct inode *, struct dentry *, umode_t, struct nameidata *); 50static int nfs_create(struct inode *, struct dentry *, umode_t, struct nameidata *);
51static int nfs_mkdir(struct inode *, struct dentry *, umode_t); 51static int nfs_mkdir(struct inode *, struct dentry *, umode_t);
52static int nfs_rmdir(struct inode *, struct dentry *); 52static int nfs_rmdir(struct inode *, struct dentry *);
@@ -1270,7 +1270,7 @@ const struct dentry_operations nfs_dentry_operations = {
1270 .d_release = nfs_d_release, 1270 .d_release = nfs_d_release,
1271}; 1271};
1272 1272
1273static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) 1273static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
1274{ 1274{
1275 struct dentry *res; 1275 struct dentry *res;
1276 struct dentry *parent; 1276 struct dentry *parent;
@@ -1291,7 +1291,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
1291 * If we're doing an exclusive create, optimize away the lookup 1291 * If we're doing an exclusive create, optimize away the lookup
1292 * but don't hash the dentry. 1292 * but don't hash the dentry.
1293 */ 1293 */
1294 if (nd && nfs_is_exclusive_create(dir, nd->flags)) { 1294 if (nfs_is_exclusive_create(dir, flags)) {
1295 d_instantiate(dentry, NULL); 1295 d_instantiate(dentry, NULL);
1296 res = NULL; 1296 res = NULL;
1297 goto out; 1297 goto out;
@@ -1482,7 +1482,7 @@ out:
1482 return err; 1482 return err;
1483 1483
1484no_open: 1484no_open:
1485 res = nfs_lookup(dir, dentry, NULL); 1485 res = nfs_lookup(dir, dentry, 0);
1486 err = PTR_ERR(res); 1486 err = PTR_ERR(res);
1487 if (IS_ERR(res)) 1487 if (IS_ERR(res))
1488 goto out; 1488 goto out;