From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Feb 2010 23:48:00 +0000 (-0800)
Subject: mds: initialize session state, even if we had it already
X-Git-Tag: v0.20~393
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0e55647c5d74609d40ba99bc736c054c2253aa3;p=ceph.git

mds: initialize session state, even if we had it already

This ensures that eagerly reconnecting clients get set to OPEN
when we replay their session from the journal.
---

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index c099eaf81c1a..b3bb32da9f8c 100644
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -226,9 +226,11 @@ public:
     return 0;
   }
   Session* get_or_add_open_session(entity_inst_t i) {
+    Session *s;
     if (session_map.count(i.name))
-      return session_map[i.name];
-    Session *s = session_map[i.name] = new Session;
+      s = session_map[i.name];
+    else
+      s = session_map[i.name] = new Session;
     s->inst = i;
     set_state(s, Session::STATE_OPEN);
     s->last_cap_renew = g_clock.now();