summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-07-22 13:46:26 -0700
committerSamuel Just <sam.just@inktank.com>2013-07-22 15:06:10 -0700
commit2fd4421707814d3563c84002d8b49b5a0c7a3dd5 (patch)
tree6482a47c5ab8a7482a4055d01468ec2620501301
parent6957dbc75cc2577652b542aa3eae69f03060cb63 (diff)
downloadceph-2fd4421707814d3563c84002d8b49b5a0c7a3dd5.tar.gz
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>
-rw-r--r--src/osd/PGLog.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 2f2c83757db..dac1f33fd91 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();
}