From: Samuel Just <sam.just@inktank.com>
Date: Mon, 22 Jul 2013 20:46:26 +0000 (-0700)
Subject: PGLog::merge_log, unidex() only works from tail, we index() below anyway
X-Git-Tag: v0.67-rc2~19^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2fd4421707814d3563c84002d8b49b5a0c7a3dd5;p=ceph.git

PGLog::merge_log, unidex() only works from tail, we index() below anyway

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 2f2c83757db5..dac1f33fd91c 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -505,7 +505,6 @@ void PGLog::merge_log(ObjectStore::Transaction& t,
 	break;
       dout(10) << "merge_log divergent " << oe << dendl;
       divergent.push_front(oe);
-      log.unindex(oe);
       log.log.pop_back();
     }