From cb1f05009d5d5a6c8806f1f9868092505f6b6c64 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 17 Aug 2011 10:47:39 -0700
Subject: [PATCH] osd_types: fix merge

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/osd/osd_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 38d0efdf4c724..62d90a49de171 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1121,7 +1121,7 @@ struct pg_stat_t {
   void decode(bufferlist::iterator &bl) {
     __u8 v;
     ::decode(v, bl);
-    if (v > 4)
+    if (v > 5)
       throw buffer::malformed_input("unknown pg_stat_t encoding version > 4");
 
     ::decode(version, bl);
-- 
2.39.5