From: <andros@netapp.com>
To: <trond.myklebust@primarydata.com>
Cc: <bfields@fieldses.org>, <chuck.lever@oracle.com>,
<linux-nfs@vger.kernel.org>, Andy Adamson <andros@netapp.com>
Subject: [PATCH Version 4 02/10] NFS refactor nfs4_match_clientids
Date: Wed, 11 May 2016 15:08:17 -0400 [thread overview]
Message-ID: <1462993705-14673-3-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1462993705-14673-1-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
For session trunking, to compare nfs41_exchange_id_res with
exiting nfs_client.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/nfs4client.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 10410e8..c9177a4 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -562,15 +562,15 @@ out:
/*
* Returns true if the client IDs match
*/
-static bool nfs4_match_clientids(struct nfs_client *a, struct nfs_client *b)
+static bool nfs4_match_clientids(u64 a, u64 b)
{
- if (a->cl_clientid != b->cl_clientid) {
+ if (a != b) {
dprintk("NFS: --> %s client ID %llx does not match %llx\n",
- __func__, a->cl_clientid, b->cl_clientid);
+ __func__, a, b);
return false;
}
dprintk("NFS: --> %s client ID %llx matches %llx\n",
- __func__, a->cl_clientid, b->cl_clientid);
+ __func__, a, b);
return true;
}
@@ -650,7 +650,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
if (pos->cl_cons_state != NFS_CS_READY)
continue;
- if (!nfs4_match_clientids(pos, new))
+ if (!nfs4_match_clientids(pos->cl_clientid, new->cl_clientid))
continue;
/*
--
1.8.3.1
next prev parent reply other threads:[~2016-05-11 19:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 19:08 [PATCH Version 4 00/11] NFSV4.1,2 session trunking andros
2016-05-11 19:08 ` [PATCH Version 4 01/10] NFS default callback ops andros
2016-05-17 20:17 ` Anna Schumaker
2016-05-17 20:21 ` Adamson, Andy
2016-05-11 19:08 ` andros [this message]
2016-05-11 19:08 ` [PATCH Version 4 03/10] NFS refactor nfs4_check_serverowner_major_id andros
2016-05-18 14:12 ` Anna Schumaker
2016-05-11 19:08 ` [PATCH Version 4 04/10] NFS detect session trunking andros
2016-05-11 19:08 ` [PATCH Version 4 05/10] NFS refactor _nfs4_proc_exchange_id for " andros
2016-05-11 19:08 ` [PATCH Version 4 06/10] SUNRPC add flag to rpc_task_release_client andros
2016-05-11 19:08 ` [PATCH Version 4 07/10] NFS probe pseudo-fs for replicas andros
2016-05-18 16:06 ` Anna Schumaker
2016-05-11 19:08 ` [PATCH Version 4 08/10] NFS test and add multipaths for session trunking andros
2016-05-18 18:23 ` Anna Schumaker
2016-05-19 17:46 ` Adamson, Andy
2016-05-11 19:08 ` [PATCH Version 4 09/10] NFS test pnfs data server multipath session trunking aliases andros
2016-05-11 19:08 ` [PATCH Version 4 10/10] NFS add multiaddr to nfs_show_nfsv4_options andros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462993705-14673-3-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).