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

client: fix kick_flushing_caps() args

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 690b7b0d650b..970fd9c8b181 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1872,7 +1872,7 @@ void Client::handle_mds_map(MMDSMap* m)
     if (newstate >= MDSMap::STATE_ACTIVE) {
       if (oldstate < MDSMap::STATE_ACTIVE) {
 	kick_requests(p->second, false);
-	kick_flushing_caps(p->first);
+	kick_flushing_caps(p->second);
 	signal_cond_list(p->second->waiting_for_open);
       }
       connect_mds_targets(p->first);
@@ -2998,10 +2998,10 @@ void Client::wait_sync_caps(uint64_t want)
   }
 }
 
-void Client::kick_flushing_caps(int mds)
+void Client::kick_flushing_caps(MetaSession *session)
 {
-  ldout(cct, 10) << "kick_flushing_caps" << dendl;
-  MetaSession *session = mds_sessions[mds];
+  int mds = session->mds_num;
+  ldout(cct, 10) << "kick_flushing_caps mds." << mds << dendl;
 
   for (xlist<CapSnap*>::iterator p = session->flushing_capsnaps.begin(); !p.end(); ++p) {
     CapSnap *capsnap = *p;
diff --git a/src/client/Client.h b/src/client/Client.h
index af03bfb0090f..da66c486899d 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -425,7 +425,7 @@ protected:
   int mark_caps_flushing(Inode *in);
   void flush_caps();
   void flush_caps(Inode *in, MetaSession *session);
-  void kick_flushing_caps(int mds);
+  void kick_flushing_caps(MetaSession *session);
   int get_caps(Inode *in, int need, int want, int *have, loff_t endoff);
 
   void maybe_update_snaprealm(SnapRealm *realm, snapid_t snap_created, snapid_t snap_highwater,