Commit 8838dc43 authored by J. Bruce Fields's avatar J. Bruce Fields

nfsd4: clean up access_valid, deny_valid checks.

Document these checks a little better and inline, as suggested by Neil
Brown (note both functions have two callers).  Remove an obviously bogus
check while we're there (checking whether unsigned value is negative).
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Cc: Neil Brown <neilb@suse.de>
parent b39c18fc
...@@ -1157,14 +1157,19 @@ find_file(struct inode *ino) ...@@ -1157,14 +1157,19 @@ find_file(struct inode *ino)
return NULL; return NULL;
} }
static int access_valid(u32 x) static inline int access_valid(u32 x)
{ {
return (x > 0 && x < 4); if (x < NFS4_SHARE_ACCESS_READ)
return 0;
if (x > NFS4_SHARE_ACCESS_BOTH)
return 0;
return 1;
} }
static int deny_valid(u32 x) static inline int deny_valid(u32 x)
{ {
return (x >= 0 && x < 5); /* Note: unlike access bits, deny bits may be zero. */
return x <= NFS4_SHARE_DENY_BOTH;
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment