diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2012-04-27 13:27:46 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:39 -0400 |
commit | 80a16b21a81eb639f0b726549f4c46c0e9aff92e (patch) | |
tree | 5095cb05498d16e64976b03c38b3fcdaa83e4ecb /fs/nfs/dir.c | |
parent | 281cad46b34db4dbb1d1e603f7b9cfe25d1ae7c9 (diff) |
NFS: Remove extra rpc_clnt argument to proc_lookup
Now that I'm doing secinfo automatically in the v4 code this extra
argument isn't needed.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 6 |
1 files changed, 3 insertions, 3 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 | } |