Commit df547efb authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

knfsd: nfsd4: simplify exp_pseudoroot arguments 



We're passing three arguments to exp_pseudoroot, two of which are just fields
of the svc_rqst.  Soon we'll want to pass in a third field as well.  So let's
just give up and pass in the whole struct svc_rqst.

Also sneak in some minor style cleanups while we're at it.

Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e677bfe4

fs/nfsd/export.c

+2 −3
Original line number Diff line number Diff line
@@ -1235,8 +1235,7 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv, 
 * export point with fsid==0

 */

__be32

exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,

	       struct cache_req *creq)

exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)

{

	struct svc_export *exp;

	__be32 rv;
@@ -1244,7 +1243,7 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, 


	mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);



	exp = exp_find(clp, FSID_NUM, fsidv, creq);

	exp = exp_find(rqstp->rq_client, FSID_NUM, fsidv, rqstp->rq_chandle);

	if (PTR_ERR(exp) == -ENOENT)

		return nfserr_perm;

	if (IS_ERR(exp))

fs/nfsd/nfs4proc.c

+3 −4
Original line number Diff line number Diff line
@@ -286,8 +286,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	__be32 status;



	fh_put(&cstate->current_fh);

	status = exp_pseudoroot(rqstp->rq_client, &cstate->current_fh,

			      &rqstp->rq_chandle);

	status = exp_pseudoroot(rqstp, &cstate->current_fh);

	return status;

}
@@ -474,8 +473,8 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	__be32 ret;



	fh_init(&tmp_fh, NFS4_FHSIZE);

	if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh,

			      &rqstp->rq_chandle)) != 0)

	ret = exp_pseudoroot(rqstp, &tmp_fh);

	if (ret)

		return ret;

	if (tmp_fh.fh_dentry == cstate->current_fh.fh_dentry) {

		fh_put(&tmp_fh);

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp, __be32 * 
	char *path, *rootpath;



	fh_init(&tmp_fh, NFS4_FHSIZE);

	*stat = exp_pseudoroot(rqstp->rq_client, &tmp_fh, &rqstp->rq_chandle);

	*stat = exp_pseudoroot(rqstp, &tmp_fh);

	if (*stat)

		return NULL;

	rootpath = tmp_fh.fh_export->ex_path;

include/linux/nfsd/export.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct svc_export * exp_parent(struct auth_domain *clp, 
				   struct cache_req *reqp);

int			exp_rootfh(struct auth_domain *, 

					char *path, struct knfsd_fh *, int maxsize);

__be32			exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq);

__be32			exp_pseudoroot(struct svc_rqst *, struct svc_fh *);

__be32			nfserrno(int errno);



extern struct cache_detail svc_export_cache;

CRA Git | Maintained and supported by SUSTech CRA and CCSE