diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-07-17 07:04:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:07 -0400 |
commit | 0989a7889695831e49e2c53c1884f52645516a90 (patch) | |
tree | f2548a7ebdedbe89121c40c0157f5554093fb0d7 /fs/nfsd/nfsfh.c | |
parent | 87548c37c8bdbf98aea002c9c04e4dc8aa27fe1b (diff) |
knfsd: nfsd: provide export lookup wrappers which take a svc_rqst
Split the callers of exp_get_by_name(), exp_find(), and exp_parent() into
those that are processing requests and those that are doing other stuff (like
looking up filehandles for mountd).
No change in behavior, just a (fairly pointless, on its own) cleanup.
(Note this has the effect of making nfsd_cross_mnt() pass rqstp->rq_client
instead of exp->ex_client into exp_find_by_name(). However, the two should
have the same value at this point.)
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/nfsfh.c')
-rw-r--r-- | fs/nfsd/nfsfh.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 89f9041a7782..180e068ea064 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
@@ -145,7 +145,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) | |||
145 | fh->fh_fsid[1] = fh->fh_fsid[2]; | 145 | fh->fh_fsid[1] = fh->fh_fsid[2]; |
146 | } | 146 | } |
147 | if ((data_left -= len)<0) goto out; | 147 | if ((data_left -= len)<0) goto out; |
148 | exp = exp_find(rqstp->rq_client, fh->fh_fsid_type, datap, &rqstp->rq_chandle); | 148 | exp = rqst_exp_find(rqstp, fh->fh_fsid_type, datap); |
149 | datap += len; | 149 | datap += len; |
150 | } else { | 150 | } else { |
151 | dev_t xdev; | 151 | dev_t xdev; |
@@ -156,8 +156,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) | |||
156 | xdev = old_decode_dev(fh->ofh_xdev); | 156 | xdev = old_decode_dev(fh->ofh_xdev); |
157 | xino = u32_to_ino_t(fh->ofh_xino); | 157 | xino = u32_to_ino_t(fh->ofh_xino); |
158 | mk_fsid(FSID_DEV, tfh, xdev, xino, 0, NULL); | 158 | mk_fsid(FSID_DEV, tfh, xdev, xino, 0, NULL); |
159 | exp = exp_find(rqstp->rq_client, FSID_DEV, tfh, | 159 | exp = rqst_exp_find(rqstp, FSID_DEV, tfh); |
160 | &rqstp->rq_chandle); | ||
161 | } | 160 | } |
162 | 161 | ||
163 | error = nfserr_stale; | 162 | error = nfserr_stale; |