Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80a16b21 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

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: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 281cad46

fs/nfs/dir.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1143,7 +1143,7 @@ static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) 
	if (fhandle == NULL || fattr == NULL)

	if (fhandle == NULL || fattr == NULL)

		goto out_error;

		goto out_error;





	error = NFS_PROTO(dir)->lookup(NFS_SERVER(dir)->client, dir, &dentry->d_name, fhandle, fattr);

	error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);

	if (error)

	if (error)

		goto out_bad;

		goto out_bad;

	if (nfs_compare_fh(NFS_FH(inode), fhandle))

	if (nfs_compare_fh(NFS_FH(inode), fhandle))
@@ -1299,7 +1299,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru 
	parent = dentry->d_parent;

	parent = dentry->d_parent;

	/* Protect against concurrent sillydeletes */

	/* Protect against concurrent sillydeletes */

	nfs_block_sillyrename(parent);

	nfs_block_sillyrename(parent);

	error = NFS_PROTO(dir)->lookup(NFS_SERVER(dir)->client, dir, &dentry->d_name, fhandle, fattr);

	error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);

	if (error == -ENOENT)

	if (error == -ENOENT)

		goto no_entry;

		goto no_entry;

	if (error < 0) {

	if (error < 0) {
@@ -1646,7 +1646,7 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, 
	if (dentry->d_inode)

	if (dentry->d_inode)

		goto out;

		goto out;

	if (fhandle->size == 0) {

	if (fhandle->size == 0) {

		error = NFS_PROTO(dir)->lookup(NFS_SERVER(dir)->client, dir, &dentry->d_name, fhandle, fattr);

		error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr);

		if (error)

		if (error)

			goto out_error;

			goto out_error;

	}

	}

fs/nfs/namespace.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -261,8 +261,7 @@ struct vfsmount *nfs_submount(struct nfs_server *server, struct dentry *dentry, 
	struct dentry *parent = dget_parent(dentry);

	struct dentry *parent = dget_parent(dentry);





	/* Look it up again to get its attributes */

	/* Look it up again to get its attributes */

	err = server->nfs_client->rpc_ops->lookup(server->client, parent->d_inode,

	err = server->nfs_client->rpc_ops->lookup(parent->d_inode, &dentry->d_name, fh, fattr);

						  &dentry->d_name, fh, fattr);

	dput(parent);

	dput(parent);

	if (err != 0)

	if (err != 0)

		return ERR_PTR(err);

		return ERR_PTR(err);

fs/nfs/nfs3proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, 
}

}





static int

static int

nfs3_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qstr *name,

nfs3_proc_lookup(struct inode *dir, struct qstr *name,

		 struct nfs_fh *fhandle, struct nfs_fattr *fattr)

		 struct nfs_fh *fhandle, struct nfs_fattr *fattr)

{

{

	struct nfs3_diropargs	arg = {

	struct nfs3_diropargs	arg = {

fs/nfs/nfs4proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2578,7 +2578,7 @@ static int nfs4_proc_lookup_common(struct rpc_clnt **clnt, struct inode *dir, 
	return err;

	return err;

}

}





static int nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qstr *name,

static int nfs4_proc_lookup(struct inode *dir, struct qstr *name,

			    struct nfs_fh *fhandle, struct nfs_fattr *fattr)

			    struct nfs_fh *fhandle, struct nfs_fattr *fattr)

{

{

	int status;

	int status;

fs/nfs/proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, 
}

}





static int

static int

nfs_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qstr *name,

nfs_proc_lookup(struct inode *dir, struct qstr *name,

		struct nfs_fh *fhandle, struct nfs_fattr *fattr)

		struct nfs_fh *fhandle, struct nfs_fattr *fattr)

{

{

	struct nfs_diropargs	arg = {

	struct nfs_diropargs	arg = {