From: Ding Dinghua <dingdinghua85@gmail.com>
Date: Thu, 30 Oct 2014 06:58:05 +0000 (+0800)
Subject: osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map
X-Git-Tag: v0.80.10~39^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11f8017cbdf94d4a8083412b96c251ee39286541;p=ceph.git

osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map

Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
(cherry picked from commit 31c584c8ba022cd44fe2872d221f3026618cefab)

Conflicts:
	src/osdc/Objecter.cc
        the debug line that follows was re-indented
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 57954a59b25..3c60c6c41fe 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -607,7 +607,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
 	  logger->inc(l_osdc_map_full);
 	}
 	else {
-	  if (e && e > m->get_oldest()) {
+	  if (e > m->get_oldest()) {
 	    ldout(cct, 3) << "handle_osd_map requesting missing epoch " << osdmap->get_epoch()+1 << dendl;
 	    maybe_request_map();
 	    break;