Commit 0989a788 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

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: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87548c37

fs/nfsd/export.c

+27 −1
Original line number Diff line number Diff line
@@ -1228,6 +1228,32 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv, 
	return exp;

}



/*

 * Called from functions that handle requests; functions that do work on

 * behalf of mountd are passed a single client name to use, and should

 * use exp_get_by_name() or exp_find().

 */

struct svc_export *

rqst_exp_get_by_name(struct svc_rqst *rqstp, struct vfsmount *mnt,

		struct dentry *dentry)

{

	return exp_get_by_name(rqstp->rq_client, mnt, dentry,

						&rqstp->rq_chandle);

}



struct svc_export *

rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)

{

	return exp_find(rqstp->rq_client, fsid_type, fsidv,

						&rqstp->rq_chandle);

}



struct svc_export *

rqst_exp_parent(struct svc_rqst *rqstp, struct vfsmount *mnt,

		struct dentry *dentry)

{

	return exp_parent(rqstp->rq_client, mnt, dentry, &rqstp->rq_chandle);

}



/*

 * 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) 


	mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);



	exp = exp_find(rqstp->rq_client, FSID_NUM, fsidv, rqstp->rq_chandle);

	exp = rqst_exp_find(rqstp, FSID_NUM, fsidv);

	if (PTR_ERR(exp) == -ENOENT)

		return nfserr_perm;

	if (IS_ERR(exp))

fs/nfsd/nfsfh.c

+2 −3
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) 
				fh->fh_fsid[1] = fh->fh_fsid[2];

			}

			if ((data_left -= len)<0) goto out;

			exp = exp_find(rqstp->rq_client, fh->fh_fsid_type, datap, &rqstp->rq_chandle);

			exp = rqst_exp_find(rqstp, fh->fh_fsid_type, datap);

			datap += len;

		} else {

			dev_t xdev;
@@ -156,8 +156,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) 
			xdev = old_decode_dev(fh->ofh_xdev);

			xino = u32_to_ino_t(fh->ofh_xino);

			mk_fsid(FSID_DEV, tfh, xdev, xino, 0, NULL);

			exp = exp_find(rqstp->rq_client, FSID_DEV, tfh,

				       &rqstp->rq_chandle);

			exp = rqst_exp_find(rqstp, FSID_DEV, tfh);

		}



		error = nfserr_stale;

fs/nfsd/vfs.c

+2 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, 


	while (follow_down(&mnt,&mounts)&&d_mountpoint(mounts));



	exp2 = exp_get_by_name(exp->ex_client, mnt, mounts, &rqstp->rq_chandle);

	exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts);

	if (IS_ERR(exp2)) {

		err = PTR_ERR(exp2);

		dput(mounts);
@@ -188,8 +188,7 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name, 
			dput(dentry);

			dentry = dp;



			exp2 = exp_parent(exp->ex_client, mnt, dentry,

					  &rqstp->rq_chandle);

			exp2 = rqst_exp_parent(rqstp, mnt, dentry);

			if (PTR_ERR(exp2) == -ENOENT) {

				dput(dentry);

				dentry = dget(dparent);

include/linux/nfsd/export.h

+7 −0
Original line number Diff line number Diff line
@@ -129,10 +129,16 @@ struct svc_export * exp_get_by_name(struct auth_domain *clp, 
					struct vfsmount *mnt,

					struct dentry *dentry,

					struct cache_req *reqp);

struct svc_export *	rqst_exp_get_by_name(struct svc_rqst *,

					     struct vfsmount *,

					     struct dentry *);

struct svc_export *	exp_parent(struct auth_domain *clp,

				   struct vfsmount *mnt,

				   struct dentry *dentry,

				   struct cache_req *reqp);

struct svc_export *	rqst_exp_parent(struct svc_rqst *,

					struct vfsmount *mnt,

					struct dentry *dentry);

int			exp_rootfh(struct auth_domain *, 

					char *path, struct knfsd_fh *, int maxsize);

__be32			exp_pseudoroot(struct svc_rqst *, struct svc_fh *);
@@ -152,6 +158,7 @@ static inline void exp_get(struct svc_export *exp) 
extern struct svc_export *

exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv,

	 struct cache_req *reqp);

struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *);



#endif /* __KERNEL__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE