summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Schumaker2017-01-11 22:51:59 +0100
committerAnna Schumaker2017-01-30 19:14:50 +0100
commit49ad0145c3a81612482ecc064ce6ab908ae3bb1a (patch)
treeadcaa7f2255485793cce93aeb9c6589c5309202e
parentNFS: No need to set and return status in nfs41_lock_expired() (diff)
downloadkernel-qcow2-linux-49ad0145c3a81612482ecc064ce6ab908ae3bb1a.tar.gz
kernel-qcow2-linux-49ad0145c3a81612482ecc064ce6ab908ae3bb1a.tar.xz
kernel-qcow2-linux-49ad0145c3a81612482ecc064ce6ab908ae3bb1a.zip
NFS: Clean up nfs41_same_server_scope()
The function is cleaner this way, since we can use the result of memcmp() directly Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 81390e97c8d5..bf014a2deefd 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7120,11 +7120,9 @@ static bool
nfs41_same_server_scope(struct nfs41_server_scope *a,
struct nfs41_server_scope *b)
{
- if (a->server_scope_sz == b->server_scope_sz &&
- memcmp(a->server_scope, b->server_scope, a->server_scope_sz) == 0)
- return true;
-
- return false;
+ if (a->server_scope_sz != b->server_scope_sz)
+ return false;
+ return memcmp(a->server_scope, b->server_scope, a->server_scope_sz) == 0;
}
static void