NFS: Clean up nfs4_check_serverowner_major_id()

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 8853c32eedf5cc284e4ca459e047c0074951b350..ce6f2ef625953e5a0338ab4274c965eb0c899bf2 100644 (file)
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -612,17 +612,8 @@ nfs4_check_serverowner_major_id(struct nfs41_server_owner *o1,
                                struct nfs41_server_owner *o2)
 {
        if (o1->major_id_sz != o2->major_id_sz)
-               goto out_major_mismatch;
-       if (memcmp(o1->major_id, o2->major_id, o1->major_id_sz) != 0)
-               goto out_major_mismatch;
-
-       dprintk("NFS: --> %s server owner major IDs match\n", __func__);
-       return true;
-
-out_major_mismatch:
-       dprintk("NFS: --> %s server owner major IDs do not match\n",
-               __func__);
-       return false;
+               return false;
+       return memcmp(o1->major_id, o2->major_id, o1->major_id_sz) == 0;
 }
 
 /*