NFS: Clean up nfs4_check_server_scope()

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index ce6f2ef625953e5a0338ab4274c965eb0c899bf2..c9016de3e5bd56c0d07b64d095ae56ed801ee8d1 100644 (file)
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -624,18 +624,9 @@ nfs4_check_server_scope(struct nfs41_server_scope *s1,
                        struct nfs41_server_scope *s2)
 {
        if (s1->server_scope_sz != s2->server_scope_sz)
-               goto out_scope_mismatch;
-       if (memcmp(s1->server_scope, s2->server_scope,
-                  s1->server_scope_sz) != 0)
-               goto out_scope_mismatch;
-
-       dprintk("NFS: --> %s server scopes match\n", __func__);
-       return true;
-
-out_scope_mismatch:
-       dprintk("NFS: --> %s server scopes do not match\n",
-               __func__);
-       return false;
+               return false;
+       return memcmp(s1->server_scope, s2->server_scope,
+                                       s1->server_scope_sz) == 0;
 }
 
 /**