diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 14:15:12 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 13:39:34 -0400 |
| commit | 5b6d3ff605d1b00ce8138da4091c527d9ad48729 (patch) | |
| tree | c1fc87396e2910229e805fcbe75d089bb6777ebb /fs/nfs | |
| parent | f251fd9e71890bcfdc838f36c10b1b57a87356ec (diff) | |
| download | linux-stable-5b6d3ff605d1b00ce8138da4091c527d9ad48729.tar.gz linux-stable-5b6d3ff605d1b00ce8138da4091c527d9ad48729.tar.bz2 linux-stable-5b6d3ff605d1b00ce8138da4091c527d9ad48729.zip | |
NFS: Clean up nfs4_check_serverowner_minor_id()
Once again, we can remove the function and compare integer values
directly.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4client.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 39b8c38b6a68..4f4f179cb849 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -604,25 +604,6 @@ out_major_mismatch: } /* - * Returns true if server minor ids match - */ -static bool -nfs4_check_serverowner_minor_id(struct nfs41_server_owner *o1, - struct nfs41_server_owner *o2) -{ - /* Check eir_server_owner so_minor_id */ - if (o1->minor_id != o2->minor_id) - goto out_minor_mismatch; - - dprintk("NFS: --> %s server owner minor IDs match\n", __func__); - return true; - -out_minor_mismatch: - dprintk("NFS: --> %s server owner minor IDs do not match\n", __func__); - return false; -} - -/* * Returns true if the server scopes match */ static bool @@ -674,8 +655,7 @@ int nfs4_detect_session_trunking(struct nfs_client *clp, goto out_err; /* Check eir_server_owner so_minor_id */ - if (!nfs4_check_serverowner_minor_id(clp->cl_serverowner, - res->server_owner)) + if (clp->cl_serverowner->minor_id != res->server_owner->minor_id) goto out_err; /* Check eir_server_scope */ |