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: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e677bfe4d4
commit
df547efb03
@@ -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);
|
||||
|
Reference in New Issue
Block a user