From: <andros@netapp.com>
To: <trond.myklebust@primarydata.com>
Cc: <anna.schumaker@netapp.com>, <bfields@fieldses.org>,
<chuck.lever@oracle.com>, <linux-nfs@vger.kernel.org>,
Andy Adamson <andros@netapp.com>
Subject: [PATCH Version 5 02/10] NFS refactor nfs4_match_clientids
Date: Fri, 20 May 2016 10:43:49 -0400 [thread overview]
Message-ID: <1463755437-17649-3-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1463755437-17649-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-20 14:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-20 14:43 [PATCH Version 5 00/10] NFSV4.1,2 session trunking andros
2016-05-20 14:43 ` [PATCH Version 5 01/10] NFS rename default callback ops andros
2016-05-20 14:43 ` andros [this message]
2016-05-20 14:43 ` [PATCH Version 5 03/10] NFS refactor nfs4_check_serverowner_major_id andros
2016-05-20 14:43 ` [PATCH Version 5 04/10] NFS detect session trunking andros
2016-05-20 14:43 ` [PATCH Version 5 05/10] NFS refactor _nfs4_proc_exchange_id for " andros
2016-05-20 14:43 ` [PATCH Version 5 06/10] SUNRPC add flag to rpc_task_release_client andros
2016-05-20 14:43 ` [PATCH Version 5 07/10] NFS probe pseudo-fs for replicas andros
2016-05-20 14:43 ` [PATCH Version 5 08/10] NFS test and add multipaths for session trunking andros
2016-05-20 14:54 ` Adamson, Andy
2016-05-20 14:43 ` [PATCH Version 5 09/10] NFS test pnfs data server multipath session trunking aliases andros
2016-05-20 14:43 ` [PATCH Version 5 10/10] NFS add multiaddr to nfs_show_nfsv4_options andros
2016-06-17 13:53 ` [PATCH Version 5 00/10] NFSV4.1,2 session trunking Martin Houry
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=1463755437-17649-3-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=anna.schumaker@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).