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

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

knfsd: clean up EX_RDONLY 



Share a little common code, reverse the arguments for consistency, drop the
unnecessary "inline", and lowercase the name.

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 e22841c6

fs/nfsd/auth.c

+2 −1
Original line number Diff line number Diff line
@@ -9,10 +9,11 @@ 
#include <linux/sunrpc/svc.h>

#include <linux/sunrpc/svcauth.h>

#include <linux/nfsd/nfsd.h>

#include <linux/nfsd/export.h>



#define	CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))



static int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)

int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)

{

	struct exp_flavor_info *f;

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

fs/nfsd/vfs.c

+3 −10
Original line number Diff line number Diff line
@@ -1797,16 +1797,9 @@ 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)

static int exp_rdonly(struct svc_rqst *rqstp, struct svc_export *exp)

{

	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;

	return nfsexp_flags(rqstp, exp) & NFSEXP_READONLY;

}



/*
@@ -1845,7 +1838,7 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp, 
	 */

	if (!(acc & MAY_LOCAL_ACCESS))

		if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {

			if (EX_RDONLY(exp, rqstp) || IS_RDONLY(inode))

			if (exp_rdonly(rqstp, exp) || IS_RDONLY(inode))

				return nfserr_rofs;

			if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))

				return nfserr_perm;

include/linux/nfsd/export.h

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

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



int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp);

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



/*