adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

knfsd: nfsd4: simplify exp_pseudoroot arguments

Browse source 
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:
J. Bruce Fields 2007-07-17 04:04:43 -07:00 committed by Linus Torvalds
parent e677bfe4d4
commit df547efb03
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/nfsd/export.c
View file

@ -1235,8 +1235,7 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv,
* export point with fsid==0 * export point with fsid==0
*/ */
__be32 __be32
exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
struct cache_req *creq)
{ {
struct svc_export *exp; struct svc_export *exp;
__be32 rv; __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); 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) if (PTR_ERR(exp) == -ENOENT)
return nfserr_perm; return nfserr_perm;
if (IS_ERR(exp)) if (IS_ERR(exp))

7
fs/nfsd/nfs4proc.c
View file

@ -286,8 +286,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
__be32 status; __be32 status;
fh_put(&cstate->current_fh); fh_put(&cstate->current_fh);
status = exp_pseudoroot(rqstp->rq_client, &cstate->current_fh, status = exp_pseudoroot(rqstp, &cstate->current_fh);
&rqstp->rq_chandle);
return status; return status;
} }
@ -474,8 +473,8 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
__be32 ret; __be32 ret;
fh_init(&tmp_fh, NFS4_FHSIZE); fh_init(&tmp_fh, NFS4_FHSIZE);
if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh, ret = exp_pseudoroot(rqstp, &tmp_fh);
&rqstp->rq_chandle)) != 0) if (ret)
return ret; return ret;
if (tmp_fh.fh_dentry == cstate->current_fh.fh_dentry) { if (tmp_fh.fh_dentry == cstate->current_fh.fh_dentry) {
fh_put(&tmp_fh); fh_put(&tmp_fh);

2
fs/nfsd/nfs4xdr.c
View file

@ -1296,7 +1296,7 @@ static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp, __be32 *
char *path, *rootpath; char *path, *rootpath;
fh_init(&tmp_fh, NFS4_FHSIZE); 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) if (*stat)
return NULL; return NULL;
rootpath = tmp_fh.fh_export->ex_path; rootpath = tmp_fh.fh_export->ex_path;

2
include/linux/nfsd/export.h
View file

@ -135,7 +135,7 @@ struct svc_export * exp_parent(struct auth_domain *clp,
struct cache_req *reqp); struct cache_req *reqp);
int exp_rootfh(struct auth_domain *, int exp_rootfh(struct auth_domain *,
char *path, struct knfsd_fh *, int maxsize); 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); __be32 nfserrno(int errno);
extern struct cache_detail svc_export_cache; extern struct cache_detail svc_export_cache;