kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NFS: Clean up nfs4_match_clientids()

Browse source 
If we cut out the dprintk()s, then we don't even need this to be a
separate function.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2017-04-07 14:15:11 -04:00 committed by Trond Myklebust
parent 5be1810a8d
commit f251fd9e71
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fs/nfs/nfs4client.c
View file

@ -582,21 +582,6 @@ out:
}
#ifdef CONFIG_NFS_V4_1
/*
* Returns true if the client IDs match
*/
static bool nfs4_match_clientids(u64 a, u64 b)
{
if (a != b) {
dprintk("NFS: --> %s client ID %llx does not match %llx\n",
__func__, a, b);
return false;
}
dprintk("NFS: --> %s client ID %llx matches %llx\n",
__func__, a, b);
return true;
}
/*
* Returns true if the server major ids match
*/
@ -680,7 +665,7 @@ int nfs4_detect_session_trunking(struct nfs_client *clp,
struct rpc_xprt *xprt)
{
/* Check eir_clientid */
if (!nfs4_match_clientids(clp->cl_clientid, res->clientid))
if (clp->cl_clientid != res->clientid)
goto out_err;
/* Check eir_server_owner so_major_id */
@ -765,7 +750,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
if (pos->cl_cons_state != NFS_CS_READY)
continue;
if (!nfs4_match_clientids(pos->cl_clientid, new->cl_clientid))
if (pos->cl_clientid != new->cl_clientid)
continue;
/*