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

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

[PATCH] knfsd: nfsd4: fix some open argument tests 



These tests always returned true; clearly that wasn't what was intended.

In keeping with kernel style, make them functions instead of macros while
we're at it.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1df0cada

fs/nfsd/nfs4state.c

+13 −4
Original line number Diff line number Diff line
@@ -1237,8 +1237,15 @@ find_file(struct inode *ino) 
	return NULL;

}



#define TEST_ACCESS(x) ((x > 0 || x < 4)?1:0)

#define TEST_DENY(x) ((x >= 0 || x < 5)?1:0)

static int access_valid(u32 x)

{

	return (x > 0 && x < 4);

}



static int deny_valid(u32 x)

{

	return (x >= 0 && x < 5);

}



static void

set_access(unsigned int *access, unsigned long bmap) {
@@ -1745,7 +1752,8 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf 
	int status;



	status = nfserr_inval;

	if (!TEST_ACCESS(open->op_share_access) || !TEST_DENY(open->op_share_deny))

	if (!access_valid(open->op_share_access)

			|| !deny_valid(open->op_share_deny))

		goto out;

	/*

	 * Lookup file; if found, lookup stateid and check open request,
@@ -2317,7 +2325,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct n 
			(int)current_fh->fh_dentry->d_name.len,

			current_fh->fh_dentry->d_name.name);



	if (!TEST_ACCESS(od->od_share_access) || !TEST_DENY(od->od_share_deny))

	if (!access_valid(od->od_share_access)

			|| !deny_valid(od->od_share_deny))

		return nfserr_inval;



	nfs4_lock_state();