Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

knfsd: move EX_RDONLY out of header 



EX_RDONLY is only called in one place; just put it there.

Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Acked-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 5d3dbbea

fs/nfsd/vfs.c

+12 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,18 @@ nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat) 
	return err;

}



static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp)

{

	struct exp_flavor_info *f;

	struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;



	for (f = exp->ex_flavors; f < end; f++) {

		if (f->pseudoflavor == rqstp->rq_flavor)

			return f->flags & NFSEXP_READONLY;

	}

	return exp->ex_flags & NFSEXP_READONLY;

}



/*

 * Check for a user's access permissions to this inode.

 */

include/linux/nfsd/export.h

+0 −12
Original line number Diff line number Diff line
@@ -116,18 +116,6 @@ struct svc_expkey { 
#define EX_NOHIDE(exp)		((exp)->ex_flags & NFSEXP_NOHIDE)

#define EX_WGATHER(exp)		((exp)->ex_flags & NFSEXP_GATHERED_WRITES)



static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp)

{

	struct exp_flavor_info *f;

	struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;



	for (f = exp->ex_flavors; f < end; f++) {

		if (f->pseudoflavor == rqstp->rq_flavor)

			return f->flags & NFSEXP_READONLY;

	}

	return exp->ex_flags & NFSEXP_READONLY;

}



__be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);



/*