From: Sage Weil <sage@inktank.com>
Date: Sat, 29 Sep 2012 07:53:28 +0000 (-0700)
Subject: osd: logger is never NULL
X-Git-Tag: v0.54~175
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ada0db3660db60c35245f4d1ddf673cf9b3a5266;p=ceph.git

osd: logger is never NULL

We set this up in init(), so we don't need to make these dereferences
conditional.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7776640ea53c..77833f6ea38d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2048,10 +2048,8 @@ void OSD::heartbeat()
   dout(30) << "heartbeat check" << dendl;
   heartbeat_check();
 
-  if (logger) {
-    logger->set(l_osd_hb_to, heartbeat_peers.size());
-    logger->set(l_osd_hb_from, 0);
-  }
+  logger->set(l_osd_hb_to, heartbeat_peers.size());
+  logger->set(l_osd_hb_from, 0);
   
   // hmm.. am i all alone?
   dout(30) << "heartbeat lonely?" << dendl;
@@ -3511,12 +3509,10 @@ void OSD::handle_osd_map(MOSDMap *m)
 	  << ", src has [" << m->oldest_map << "," << m->newest_map << "]"
 	  << dendl;
 
-  if (logger) {
-    logger->inc(l_osd_map);
-    logger->inc(l_osd_mape, last - first + 1);
-    if (first <= osdmap->get_epoch())
-      logger->inc(l_osd_mape_dup, osdmap->get_epoch() - first + 1);
-  }
+  logger->inc(l_osd_map);
+  logger->inc(l_osd_mape, last - first + 1);
+  if (first <= osdmap->get_epoch())
+    logger->inc(l_osd_mape_dup, osdmap->get_epoch() - first + 1);
 
   // make sure there is something new, here, before we bother flushing the queues and such
   if (last <= osdmap->get_epoch()) {
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 06b71b752faa..6b9a89359ab0 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3896,8 +3896,7 @@ ReplicatedPG::RepGather *ReplicatedPG::new_repop(OpContext *ctx, ObjectContext *
   repop_map[repop->rep_tid] = repop;
   repop->get();
 
-  if (osd->logger)
-    osd->logger->set(l_osd_op_wip, repop_map.size());
+  osd->logger->set(l_osd_op_wip, repop_map.size());
 
   return repop;
 }
@@ -3907,8 +3906,7 @@ void ReplicatedPG::remove_repop(RepGather *repop)
   repop_map.erase(repop->rep_tid);
   repop->put();
 
-  if (osd->logger)
-    osd->logger->set(l_osd_op_wip, repop_map.size());
+  osd->logger->set(l_osd_op_wip, repop_map.size());
 }
 
 void ReplicatedPG::repop_ack(RepGather *repop, int result, int ack_type,