aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/dir.c6
-rw-r--r--fs/nfs/namespace.c3
-rw-r--r--fs/nfs/nfs3proc.c2
-rw-r--r--fs/nfs/nfs4proc.c2
-rw-r--r--fs/nfs/proc.c2
-rw-r--r--include/linux/nfs_xdr.h2
6 files changed, 8 insertions, 9 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 8789210c6905..82b42e2ea65c 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1143,7 +1143,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)
1143 if (fhandle == NULL || fattr == NULL) 1143 if (fhandle == NULL || fattr == NULL)
1144 goto out_error; 1144 goto out_error;
1145 1145
1146 error = NFS_PROTO(dir)->lookup(NFS_SERVER(dir)->client, dir, &dentry->d_name, fhandle, fattr); 1146 error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);
1147 if (error) 1147 if (error)
1148 goto out_bad; 1148 goto out_bad;
1149 if (nfs_compare_fh(NFS_FH(inode), fhandle)) 1149 if (nfs_compare_fh(NFS_FH(inode), fhandle))
@@ -1299,7 +1299,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
1299 parent = dentry->d_parent; 1299 parent = dentry->d_parent;
1300 /* Protect against concurrent sillydeletes */ 1300 /* Protect against concurrent sillydeletes */
1301 nfs_block_sillyrename(parent); 1301 nfs_block_sillyrename(parent);
1302 error = NFS_PROTO(dir)->lookup(NFS_SERVER(dir)->client, dir, &dentry->d_name, fhandle, fattr); 1302 error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);
1303 if (error == -ENOENT) 1303 if (error == -ENOENT)
1304 goto no_entry; 1304 goto no_entry;
1305 if (error < 0) { 1305 if (error < 0) {
@@ -1646,7 +1646,7 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,
1646 if (dentry->d_inode) 1646 if (dentry->d_inode)
1647 goto out; 1647 goto out;
1648 if (fhandle->size == 0) { 1648 if (fhandle->size == 0) {
1649 error = NFS_PROTO(dir)->lookup(NFS_SERVER(dir)->client, dir, &dentry->d_name, fhandle, fattr); 1649 error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);
1650 if (error) 1650 if (error)
1651 goto out_error; 1651 goto out_error;
1652 } 1652 }
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index e36fd8a51819..08b9c93675da 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -261,8 +261,7 @@ struct vfsmount *nfs_submount(struct nfs_server *server, struct dentry *dentry,
261 struct dentry *parent = dget_parent(dentry); 261 struct dentry *parent = dget_parent(dentry);
262 262
263 /* Look it up again to get its attributes */ 263 /* Look it up again to get its attributes */
264 err = server->nfs_client->rpc_ops->lookup(server->client, parent->d_inode, 264 err = server->nfs_client->rpc_ops->lookup(parent->d_inode, &dentry->d_name, fh, fattr);
265 &dentry->d_name, fh, fattr);
266 dput(parent); 265 dput(parent);
267 if (err != 0) 266 if (err != 0)
268 return ERR_PTR(err); 267 return ERR_PTR(err);
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index c23214d55ecf..48bcad294161 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -142,7 +142,7 @@ nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
142} 142}
143 143
144static int 144static int
145nfs3_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qstr *name, 145nfs3_proc_lookup(struct inode *dir, struct qstr *name,
146 struct nfs_fh *fhandle, struct nfs_fattr *fattr) 146 struct nfs_fh *fhandle, struct nfs_fattr *fattr)
147{ 147{
148 struct nfs3_diropargs arg = { 148 struct nfs3_diropargs arg = {
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2091af294c61..1780391a2c4c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2578,7 +2578,7 @@ out:
2578 return err; 2578 return err;
2579} 2579}
2580 2580
2581static int nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qstr *name, 2581static int nfs4_proc_lookup(struct inode *dir, struct qstr *name,
2582 struct nfs_fh *fhandle, struct nfs_fattr *fattr) 2582 struct nfs_fh *fhandle, struct nfs_fattr *fattr)
2583{ 2583{
2584 int status; 2584 int status;
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 76b3229fc527..fea9163d6f8e 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -178,7 +178,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
178} 178}
179 179
180static int 180static int
181nfs_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qstr *name, 181nfs_proc_lookup(struct inode *dir, struct qstr *name,
182 struct nfs_fh *fhandle, struct nfs_fattr *fattr) 182 struct nfs_fh *fhandle, struct nfs_fattr *fattr)
183{ 183{
184 struct nfs_diropargs arg = { 184 struct nfs_diropargs arg = {
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 4dada94eba7d..c940d46eb423 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1347,7 +1347,7 @@ struct nfs_rpc_ops {
1347 struct nfs_fattr *); 1347 struct nfs_fattr *);
1348 int (*setattr) (struct dentry *, struct nfs_fattr *, 1348 int (*setattr) (struct dentry *, struct nfs_fattr *,
1349 struct iattr *); 1349 struct iattr *);
1350 int (*lookup) (struct rpc_clnt *clnt, struct inode *, struct qstr *, 1350 int (*lookup) (struct inode *, struct qstr *,
1351 struct nfs_fh *, struct nfs_fattr *); 1351 struct nfs_fh *, struct nfs_fattr *);
1352 int (*access) (struct inode *, struct nfs_access_entry *); 1352 int (*access) (struct inode *, struct nfs_access_entry *);
1353 int (*readlink)(struct inode *, struct page *, unsigned int, 1353 int (*readlink)(struct inode *, struct page *, unsigned int,