From 512c7ef5bd0846fb016d6b2f176707a59ad4b845 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 27 Apr 2009 10:22:24 -0700
Subject: [PATCH] osd: fix merge_log when split point is divergent

Need to compare full eversion (including epoch).
---
 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 01fd1b7dbccdc..bd18420424c81 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -350,7 +350,7 @@ void PG::merge_log(ObjectStore::Transaction& t,
 	  oldest_update = p->version;
 	}
 
-	if (p->version.version == log.top.version)
+	if (p->version == log.top)
 	  p++;       // move past the split point, if it also exists in our old log...
 	break;
       }
-- 
2.39.5