From 8fc8b5bbd830ffd66f41bc4ee3bf407c91dc0e6f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 27 Apr 2009 13:54:10 -0700
Subject: [PATCH] osd: fix merge_log split point

Look at full eversion, not just .version (part 2).
---
 src/osd/PG.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a115c03c73f33..3450c0dc48261 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -341,7 +341,7 @@ void PG::merge_log(ObjectStore::Transaction& t,
     list<Log::Entry>::iterator p = log.log.end();
     while (p != log.log.begin()) {
       p--;
-      if (p->version.version <= log.top.version) {
+      if (p->version <= log.top) {
 	dout(10) << "merge_log split point is " << *p << dendl;
 
 	if (p->version < log.top && p->version < oldest_update) {
-- 
2.39.5