From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 3 Jul 2013 20:04:45 +0000 (-0700)
Subject: rgw: make rgw_cls_complete_op backward compatible
X-Git-Tag: v0.67-rc1~128^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2873c1d23bd7746193c421d6f9de5c781d0798d;p=ceph.git

rgw: make rgw_cls_complete_op backward compatible

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
index c0c69d2e4ed1..25616c7776a3 100644
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -84,11 +84,12 @@ struct rgw_cls_obj_complete_op
     uint8_t c = (uint8_t)op;
     ::encode(c, bl);
     ::encode(name, bl);
-    ::encode(ver, bl);
+    ::encode(ver.epoch, bl);
     ::encode(meta, bl);
     ::encode(tag, bl);
     ::encode(locator, bl);
     ::encode(remove_objs, bl);
+    ::encode(ver, bl);
     ::encode(log_op, bl);
     ENCODE_FINISH(bl);
  }
@@ -98,12 +99,7 @@ struct rgw_cls_obj_complete_op
     ::decode(c, bl);
     op = (RGWModifyOp)c;
     ::decode(name, bl);
-    if (struct_v >= 5) {
-      ::decode(ver, bl);
-    } else {
-      ver.pool = 0;
-      ::decode(ver.epoch, bl);
-    }
+    ::decode(ver.epoch, bl);
     ::decode(meta, bl);
     ::decode(tag, bl);
     if (struct_v >= 2) {
@@ -112,6 +108,11 @@ struct rgw_cls_obj_complete_op
     if (struct_v >= 4) {
       ::decode(remove_objs, bl);
     }
+    if (struct_v >= 5) {
+      ::decode(ver, bl);
+    } else {
+      ver.pool = -1;
+    }
     if (struct_v >= 6) {
       ::decode(log_op, bl);
     }