From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Sep 2011 16:39:53 +0000 (-0700)
Subject: client: factor out flush_cap_releases() helper
X-Git-Tag: v0.35~79
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=15cd43de6404d80880511fc5df9acd8ec4d1a498;p=ceph.git

client: factor out flush_cap_releases() helper

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index c5fa15abf799b..7e3a0b7c06fc4 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -3392,6 +3392,19 @@ public:
   }
 };
 
+void Client::flush_cap_releases()
+{
+  // send any cap releases
+  for (map<int,MetaSession*>::iterator p = mds_sessions.begin();
+       p != mds_sessions.end();
+       p++) {
+    if (p->second->release) {
+      messenger->send_message(p->second->release, mdsmap->get_inst(p->first));
+      p->second->release = 0;
+    }
+  }
+}
+
 void Client::tick()
 {
   ldout(cct, 21) << "tick" << dendl;
@@ -3406,15 +3419,7 @@ void Client::tick()
     if (el > mdsmap->get_session_timeout() / 3.0)
       renew_caps();
 
-    // send any cap releases
-    for (map<int,MetaSession*>::iterator p = mds_sessions.begin();
-	 p != mds_sessions.end();
-	 p++) {
-      if (p->second->release) {
-	messenger->send_message(p->second->release, mdsmap->get_inst(p->first));
-	p->second->release = 0;
-      }
-    }
+    flush_cap_releases();
   }
 
   // delayed caps
diff --git a/src/client/Client.h b/src/client/Client.h
index f4a5f1404f766..43e38a5329733 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -198,6 +198,7 @@ class Client : public Dispatcher {
   utime_t last_cap_renew;
   void renew_caps();
   void renew_caps(int s);
+  void flush_cap_releases();
 public:
   void tick();