diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 20:15:15 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 19:39:34 +0200 |
| commit | 8da0f93438ca4a03f23d8f3275b253b0897c8833 (patch) | |
| tree | cccdade76a85724b8f3ddb6d7f9a6d7de784d52a /fs/nfs/nfs4client.c | |
| parent | NFS: Clean up nfs4_check_serverowner_major_id() (diff) | |
| download | linux-8da0f93438ca4a03f23d8f3275b253b0897c8833.tar.xz linux-8da0f93438ca4a03f23d8f3275b253b0897c8833.zip | |
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>
Diffstat (limited to 'fs/nfs/nfs4client.c')
| -rw-r--r-- | fs/nfs/nfs4client.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index ce6f2ef62595..c9016de3e5bd 100644 --- 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; } /** |