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

Commit 2ed4b95b authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Clean up nfs4_proc_get_rootfh 



The long lines with no vertical white space make this function
difficult for humans to read.  Add a proper documenting comment
while we're here.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 75bc8821

fs/nfs/nfs4proc.c

+22 −10
Original line number Diff line number Diff line
@@ -2547,24 +2547,36 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle, 
	return status;

}



/*

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

static int nfs4_do_find_root_sec(struct nfs_server *server,

		struct nfs_fh *fhandle, struct nfs_fsinfo *info)

{

	int mv = server->nfs_client->cl_minorversion;

	return nfs_v4_minor_ops[mv]->find_root_sec(server, fhandle, info);

}



/**

 * nfs4_proc_get_rootfh - get file handle for server's pseudoroot

 * @server: initialized nfs_server handle

 * @fhandle: we fill in the pseudo-fs root file handle

 * @info: we fill in an FSINFO struct

 *

 * Returns zero on success, or a negative errno.

 */

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;

	int status = nfs4_lookup_root(server, fhandle, info);

	if ((status == -NFS4ERR_WRONGSEC) && !(server->flags & NFS_MOUNT_SECFLAVOUR))

		/*

		 * A status of -NFS4ERR_WRONGSEC will be mapped to -EPERM

		 * by nfs4_map_errors() as this function exits.

		 */

		status = nfs_v4_minor_ops[minor_version]->find_root_sec(server, fhandle, info);

	int status;



	status = nfs4_lookup_root(server, fhandle, info);

	if ((status == -NFS4ERR_WRONGSEC) &&

	    !(server->flags & NFS_MOUNT_SECFLAVOUR))

		status = nfs4_do_find_root_sec(server, fhandle, info);



	if (status == 0)

		status = nfs4_server_capabilities(server, fhandle);

	if (status == 0)

		status = nfs4_do_fsinfo(server, fhandle, info);



	return nfs4_map_errors(status);

}