From: Samuel Just <sam.just@inktank.com>
Date: Fri, 21 Feb 2014 00:00:52 +0000 (-0800)
Subject: PG::build_might_have_unfound: skip CRUSH_ITEM_NONE
X-Git-Tag: v0.78~148^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1278%2Fhead;p=ceph.git

PG::build_might_have_unfound: skip CRUSH_ITEM_NONE

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 0941d274834..f6bb826b203 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1355,7 +1355,7 @@ void PG::build_might_have_unfound()
     std::vector<int>::const_iterator a = interval.acting.begin();
     std::vector<int>::const_iterator a_end = interval.acting.end();
     for (; a != a_end; ++a, ++i) {
-      if (*a != osd->whoami)
+      if (*a != CRUSH_ITEM_NONE && *a != osd->whoami)
 	might_have_unfound.insert(
 	  pg_shard_t(
 	    *a,