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

Commit 3028eb2b authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Rename nfs4_proc_get_root() 



This function is really getting the root filehandle and not the root
dentry of the filesystem.  I also removed the rpc_ops lookup from
nfs4_get_rootfh() under the assumption that if we reach this function
then we already know we are using NFS v4.

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

fs/nfs/getroot.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh) 
		goto out;



	/* Start by getting the root filehandle from the server */

	ret = server->nfs_client->rpc_ops->getroot(server, mntfh, &fsinfo);

	ret = nfs4_proc_get_rootfh(server, mntfh, &fsinfo);

	if (ret < 0) {

		dprintk("nfs4_get_rootfh: getroot error = %d\n", -ret);

		goto out;

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *, struct dentry *, 
/* nfs4proc.c */

extern int nfs4_proc_setclientid(struct nfs_client *, u32, unsigned short, struct rpc_cred *, struct nfs4_setclientid_res *);

extern int nfs4_proc_setclientid_confirm(struct nfs_client *, struct nfs4_setclientid_res *arg, struct rpc_cred *);

extern int nfs4_proc_get_rootfh(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);

extern int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred);

extern int nfs4_init_clientid(struct nfs_client *, struct rpc_cred *);

extern int nfs41_init_clientid(struct nfs_client *, struct rpc_cred *);

fs/nfs/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -2345,7 +2345,7 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle, 
/*

 * get the file handle for the "/" directory on the server

 */

static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,

int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,

			 struct nfs_fsinfo *info)

{

	int minor_version = server->nfs_client->cl_minorversion;
@@ -6539,7 +6539,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.dir_inode_ops	= &nfs4_dir_inode_operations,

	.file_inode_ops	= &nfs4_file_inode_operations,

	.file_ops	= &nfs4_file_operations,

	.getroot	= nfs4_proc_get_root,

	.getroot	= nfs4_proc_get_rootfh,

	.submount	= nfs4_submount,

	.getattr	= nfs4_proc_getattr,

	.setattr	= nfs4_proc_setattr,