aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/export.c28
-rw-r--r--fs/nfsd/nfsfh.c5
-rw-r--r--fs/nfsd/vfs.c5
3 files changed, 31 insertions, 7 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index af6abb2529c9..9b569af695ab 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1228,6 +1228,32 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv,
1228 return exp; 1228 return exp;
1229} 1229}
1230 1230
1231/*
1232 * Called from functions that handle requests; functions that do work on
1233 * behalf of mountd are passed a single client name to use, and should
1234 * use exp_get_by_name() or exp_find().
1235 */
1236struct svc_export *
1237rqst_exp_get_by_name(struct svc_rqst *rqstp, struct vfsmount *mnt,
1238 struct dentry *dentry)
1239{
1240 return exp_get_by_name(rqstp->rq_client, mnt, dentry,
1241 &rqstp->rq_chandle);
1242}
1243
1244struct svc_export *
1245rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)
1246{
1247 return exp_find(rqstp->rq_client, fsid_type, fsidv,
1248 &rqstp->rq_chandle);
1249}
1250
1251struct svc_export *
1252rqst_exp_parent(struct svc_rqst *rqstp, struct vfsmount *mnt,
1253 struct dentry *dentry)
1254{
1255 return exp_parent(rqstp->rq_client, mnt, dentry, &rqstp->rq_chandle);
1256}
1231 1257
1232/* 1258/*
1233 * Called when we need the filehandle for the root of the pseudofs, 1259 * Called when we need the filehandle for the root of the pseudofs,
@@ -1243,7 +1269,7 @@ exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
1243 1269
1244 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL); 1270 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);
1245 1271
1246 exp = exp_find(rqstp->rq_client, FSID_NUM, fsidv, rqstp->rq_chandle); 1272 exp = rqst_exp_find(rqstp, FSID_NUM, fsidv);
1247 if (PTR_ERR(exp) == -ENOENT) 1273 if (PTR_ERR(exp) == -ENOENT)
1248 return nfserr_perm; 1274 return nfserr_perm;
1249 if (IS_ERR(exp)) 1275 if (IS_ERR(exp))
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;
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index ec6aaf8b0e36..65043af232ee 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -113,7 +113,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
113 113
114 while (follow_down(&mnt,&mounts)&&d_mountpoint(mounts)); 114 while (follow_down(&mnt,&mounts)&&d_mountpoint(mounts));
115 115
116 exp2 = exp_get_by_name(exp->ex_client, mnt, mounts, &rqstp->rq_chandle); 116 exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts);
117 if (IS_ERR(exp2)) { 117 if (IS_ERR(exp2)) {
118 err = PTR_ERR(exp2); 118 err = PTR_ERR(exp2);
119 dput(mounts); 119 dput(mounts);
@@ -188,8 +188,7 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name,
188 dput(dentry); 188 dput(dentry);
189 dentry = dp; 189 dentry = dp;
190 190
191 exp2 = exp_parent(exp->ex_client, mnt, dentry, 191 exp2 = rqst_exp_parent(rqstp, mnt, dentry);
192 &rqstp->rq_chandle);
193 if (PTR_ERR(exp2) == -ENOENT) { 192 if (PTR_ERR(exp2) == -ENOENT) {
194 dput(dentry); 193 dput(dentry);
195 dentry = dget(dparent); 194 dentry = dget(dparent);