mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
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>
This commit is contained in:
parent
f251fd9e71
commit
5b6d3ff605
1 changed files with 1 additions and 21 deletions
|
@ -603,25 +603,6 @@ nfs4_check_serverowner_major_id(struct nfs41_server_owner *o1,
|
|||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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
|
||||
*/
|
||||
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue