osd: simplify the session ref-counting branches

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 889fb47b78d7e8da23052f0f5547f940af042a96..d13ca3b8307d1d5e148ee62ecafa2bf40e3f5f06 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2982,14 +2982,16 @@ void OSD::handle_osd_map(MOSDMap *m)
   }
 
   Session *session = (Session *)m->get_connection()->get_priv();
-  if (session && !(session->caps.is_mon() || session->caps.is_osd())) {
+  bool is_mon_or_osd = false;
+  if (session) {
+    is_mon_or_osd = session->caps.is_mon() || session->caps.is_osd();
+    session->put();
+  }
+  if (!is_mon_or_osd) {
     //not enough perms!
     m->put();
-    session->put();
     return;
   }
-  if (session)
-    session->put();
 
   epoch_t first = m->get_first();
   epoch_t last = m->get_last();