summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4client.c
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-04-07 14:15:14 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-04-20 13:39:34 -0400
commitddfa0d4860347bfc491929af2750088bb75c5462 (patch)
tree7bacb5dc3bc358aeb88e7b1cc479b18cb5f1697a /fs/nfs/nfs4client.c
parent14d1bbb0ca425c4fdd9a38eaac346c028661b752 (diff)
downloadlinux-stable-ddfa0d4860347bfc491929af2750088bb75c5462.tar.gz
linux-stable-ddfa0d4860347bfc491929af2750088bb75c5462.tar.bz2
linux-stable-ddfa0d4860347bfc491929af2750088bb75c5462.zip
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>
Diffstat (limited to 'fs/nfs/nfs4client.c')
-rw-r--r--fs/nfs/nfs4client.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 8853c32eedf5..ce6f2ef62595 100644
--- 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;
}
/*