From: Dong Yuan <yuandong1222@gmail.com>
Date: Wed, 8 Oct 2014 07:56:30 +0000 (+0000)
Subject: Avoid unused pg_to_acting_osds call in OSDMap::get_primary_shard for not ec pool
X-Git-Tag: v0.89~34^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a32e8cb5515774738d1da5fa52815025d58fa4e;p=ceph.git

Avoid unused pg_to_acting_osds call in OSDMap::get_primary_shard for not ec pool

Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
---

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index aafadb6b6c0e..1ae02695ac89 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -672,19 +672,18 @@ public:
     if (i == get_pools().end()) {
       return false;
     }
+    if (!i->second.ec_pool()) {
+      *out = spg_t(pgid);
+      return true;
+    }
     int primary;
     vector<int> acting;
     pg_to_acting_osds(pgid, &acting, &primary);
-    if (i->second.ec_pool()) {
-      for (uint8_t i = 0; i < acting.size(); ++i) {
-	if (acting[i] == primary) {
-	  *out = spg_t(pgid, shard_id_t(i));
-	  return true;
-	}
+    for (uint8_t i = 0; i < acting.size(); ++i) {
+      if (acting[i] == primary) {
+        *out = spg_t(pgid, shard_id_t(i));
+        return true;
       }
-    } else {
-      *out = spg_t(pgid);
-      return true;
     }
     return false;
   }