diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 14:15:11 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 13:39:34 -0400 |
| commit | f251fd9e71890bcfdc838f36c10b1b57a87356ec (patch) | |
| tree | bfaf3ae060480922f1b24c3737acb748dff5b085 | |
| parent | 5be1810a8dc12573b89602867bc0dc1057e7f79f (diff) | |
| download | talos-obmc-linux-f251fd9e71890bcfdc838f36c10b1b57a87356ec.tar.gz talos-obmc-linux-f251fd9e71890bcfdc838f36c10b1b57a87356ec.zip | |
NFS: Clean up nfs4_match_clientids()
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>
| -rw-r--r-- | fs/nfs/nfs4client.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 8346ccbf2d52..39b8c38b6a68 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -583,21 +583,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 */ static bool @@ -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; /* |
