Commit 5b6d3ff6 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust

NFS: Clean up nfs4_check_serverowner_minor_id()

Once again, we can remove the function and compare integer values
directly.
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f251fd9e
...@@ -603,25 +603,6 @@ nfs4_check_serverowner_major_id(struct nfs41_server_owner *o1, ...@@ -603,25 +603,6 @@ nfs4_check_serverowner_major_id(struct nfs41_server_owner *o1,
return false; 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 * Returns true if the server scopes match
*/ */
...@@ -674,8 +655,7 @@ int nfs4_detect_session_trunking(struct nfs_client *clp, ...@@ -674,8 +655,7 @@ int nfs4_detect_session_trunking(struct nfs_client *clp,
goto out_err; goto out_err;
/* Check eir_server_owner so_minor_id */ /* Check eir_server_owner so_minor_id */
if (!nfs4_check_serverowner_minor_id(clp->cl_serverowner, if (clp->cl_serverowner->minor_id != res->server_owner->minor_id)
res->server_owner))
goto out_err; goto out_err;
/* Check eir_server_scope */ /* Check eir_server_scope */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment