From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Mar 2013 23:07:47 +0000 (-0700)
Subject: client: fix wake_inode_waiters() arg
X-Git-Tag: v0.60~81^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca5d68a2c35b638dd832a0abe741d88ecb90ce09;p=ceph.git

client: fix wake_inode_waiters() arg

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index b3c934f064ee..0317781c07cc 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1546,7 +1546,7 @@ void Client::handle_client_session(MClientSession *m)
     if (session->cap_renew_seq == m->get_seq()) {
       session->cap_ttl =
 	session->last_cap_renew_request + mdsmap->get_session_timeout();
-      wake_inode_waiters(from);
+      wake_inode_waiters(session);
     }
     break;
 
@@ -2576,10 +2576,9 @@ void Client::signal_cond_list(list<Cond*>& ls)
   ls.clear();
 }
 
-void Client::wake_inode_waiters(int mds_num)
+void Client::wake_inode_waiters(MetaSession *s)
 {
-  MetaSession * mds = mds_sessions[mds_num];
-  xlist<Cap*>::iterator iter = mds->caps.begin();
+  xlist<Cap*>::iterator iter = s->caps.begin();
   while (!iter.end()){
     signal_cond_list((*iter)->inode->waitfor_caps);
     ++iter;
diff --git a/src/client/Client.h b/src/client/Client.h
index 1d257073a7ea..33419a266cdd 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -338,7 +338,7 @@ protected:
   Mutex                  client_lock;
 
   // helpers
-  void wake_inode_waiters(int mds);
+  void wake_inode_waiters(MetaSession *s);
   void wait_on_list(list<Cond*>& ls);
   void signal_cond_list(list<Cond*>& ls);