diff options
| author | athanatos <rexludorum@gmail.com> | 2013-06-19 15:57:28 -0700 |
|---|---|---|
| committer | athanatos <rexludorum@gmail.com> | 2013-06-19 15:57:28 -0700 |
| commit | 90564025786343e10d76fb75cd1ef6b9107098cc (patch) | |
| tree | 688adc71b9d0872175f1fb6177774b3279691dcb | |
| parent | 8a5d989c39ed626ae7836cdd867bdcf67b61fc06 (diff) | |
| parent | 09e869a4c4424832a7bdc1933fad186d2536517a (diff) | |
| download | ceph-90564025786343e10d76fb75cd1ef6b9107098cc.tar.gz | |
Merge pull request #366 from dachary/wip-5398
PGLog::rewind_divergent_log must not call mark_dirty_from on end()
Reviewed-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/PGLog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index d62991e06d6..785bdc584ad 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -366,8 +366,8 @@ void PGLog::rewind_divergent_log(ObjectStore::Transaction& t, eversion_t newhead divergent.swap(log.log); break; } - mark_dirty_from(p->version); --p; + mark_dirty_from(p->version); if (p->version == newhead) { ++p; divergent.splice(divergent.begin(), log.log, p, log.log.end()); |