aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4client.c
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2013-06-05 11:15:01 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-06-08 16:20:18 -0400
commit459de2edb9105a5d091f8215650e12c0812d59f3 (patch)
treee6a67386ede1617344d1e887b42a8967444995b4 /fs/nfs/nfs4client.c
parentf58eda9bc2f0793da4c5c1098d55df2b31e0d682 (diff)
NFS: Make callbacks minor version generic
I found a few places that hardcode the minor version number rather than making it dependent on the protocol the callback came in over. This patch makes it easier to add new minor versions in the future. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4client.c')
-rw-r--r--fs/nfs/nfs4client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 2a297eeda474..18191919cc0b 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -567,14 +567,14 @@ static bool nfs4_cb_match_client(const struct sockaddr *addr,
567 */ 567 */
568struct nfs_client * 568struct nfs_client *
569nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr, 569nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
570 struct nfs4_sessionid *sid) 570 struct nfs4_sessionid *sid, u32 minorversion)
571{ 571{
572 struct nfs_client *clp; 572 struct nfs_client *clp;
573 struct nfs_net *nn = net_generic(net, nfs_net_id); 573 struct nfs_net *nn = net_generic(net, nfs_net_id);
574 574
575 spin_lock(&nn->nfs_client_lock); 575 spin_lock(&nn->nfs_client_lock);
576 list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) { 576 list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {
577 if (nfs4_cb_match_client(addr, clp, 1) == false) 577 if (nfs4_cb_match_client(addr, clp, minorversion) == false)
578 continue; 578 continue;
579 579
580 if (!nfs4_has_session(clp)) 580 if (!nfs4_has_session(clp))
@@ -597,7 +597,7 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
597 597
598struct nfs_client * 598struct nfs_client *
599nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr, 599nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
600 struct nfs4_sessionid *sid) 600 struct nfs4_sessionid *sid, u32 minorversion)
601{ 601{
602 return NULL; 602 return NULL;
603} 603}