aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/export.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-07-17 07:04:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:07 -0400
commitdf547efb03e3e8f9ea726e1d07fbbd6fd0706cd7 (patch)
treeff0b523096d135562dd979af4864ad6846a359c7 /fs/nfsd/export.c
parente677bfe4d451f8271986a229270c6eecd1f62b3f (diff)
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>
Diffstat (limited to 'fs/nfsd/export.c')
-rw-r--r--fs/nfsd/export.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index fbbbcc5a2fa..af6abb2529c 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1235,8 +1235,7 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv,
1235 * export point with fsid==0 1235 * export point with fsid==0
1236 */ 1236 */
1237__be32 1237__be32
1238exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, 1238exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
1239 struct cache_req *creq)
1240{ 1239{
1241 struct svc_export *exp; 1240 struct svc_export *exp;
1242 __be32 rv; 1241 __be32 rv;
@@ -1244,7 +1243,7 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,
1244 1243
1245 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL); 1244 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);
1246 1245
1247 exp = exp_find(clp, FSID_NUM, fsidv, creq); 1246 exp = exp_find(rqstp->rq_client, FSID_NUM, fsidv, rqstp->rq_chandle);
1248 if (PTR_ERR(exp) == -ENOENT) 1247 if (PTR_ERR(exp) == -ENOENT)
1249 return nfserr_perm; 1248 return nfserr_perm;
1250 if (IS_ERR(exp)) 1249 if (IS_ERR(exp))