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

Commit 7c513058 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: lookup supports alternate client 



A later patch will need to perform a lookup using an
alternate client with a different security flavor.
This patch adds support for doing that on NFS v4.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e73b83f2

fs/nfs/dir.c

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

		goto out_error;



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

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

	if (error)

		goto out_bad;

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

	/* Protect against concurrent sillydeletes */

	nfs_block_sillyrename(parent);

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

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

	if (error == -ENOENT)

		goto no_entry;

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

		goto out;

	if (fhandle->size == 0) {

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

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

		if (error)

			goto out_error;

	}

fs/nfs/internal.h

+4 −2
Original line number Diff line number Diff line
@@ -296,12 +296,14 @@ extern int nfs4_init_client(struct nfs_client *clp, 
			    rpc_authflavor_t authflavour,

			    int noresvport);

extern void nfs4_reset_write(struct rpc_task *task, struct nfs_write_data *data);

extern int _nfs4_call_sync(struct nfs_server *server,

extern int _nfs4_call_sync(struct rpc_clnt *clnt,

			   struct nfs_server *server,

			   struct rpc_message *msg,

			   struct nfs4_sequence_args *args,

			   struct nfs4_sequence_res *res,

			   int cache_reply);

extern int _nfs4_call_sync_session(struct nfs_server *server,

extern int _nfs4_call_sync_session(struct rpc_clnt *clnt,

				   struct nfs_server *server,

				   struct rpc_message *msg,

				   struct nfs4_sequence_args *args,

				   struct nfs4_sequence_res *res,

fs/nfs/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ struct vfsmount *nfs_d_automount(struct path *path) 


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

	parent = dget_parent(path->dentry);

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

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

						  &path->dentry->d_name,

						  fh, fattr);

	dput(parent);

fs/nfs/nfs3proc.c

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



static int

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

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

		 struct nfs_fh *fhandle, struct nfs_fattr *fattr)

{

	struct nfs3_diropargs	arg = {

fs/nfs/nfs4_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ enum nfs4_session_state { 
struct nfs4_minor_version_ops {

	u32	minor_version;



	int	(*call_sync)(struct nfs_server *server,

	int	(*call_sync)(struct rpc_clnt *clnt,

			struct nfs_server *server,

			struct rpc_message *msg,

			struct nfs4_sequence_args *args,

			struct nfs4_sequence_res *res,