From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 18 Apr 2017 14:05:53 +0000 (-0400)
Subject: librbd: corrected resize RPC message backwards compatibility
X-Git-Tag: v11.2.1~132^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=10677644181356f561cc10a19d76833d55917a43;p=ceph.git

librbd: corrected resize RPC message backwards compatibility

Commit d1f2c557 incorrectly changed the order of variables within
the payload. This resulted in breaking the resize RPC message
with older versions of Ceph.

Fixes: http://tracker.ceph.com/issues/19636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9db305a99fd945059a173f5ae8ae61744dd28615)
---

diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc
index bbee3a100173a..f165441a54e3b 100644
--- a/src/librbd/WatchNotifyTypes.cc
+++ b/src/librbd/WatchNotifyTypes.cc
@@ -208,14 +208,14 @@ void AsyncCompletePayload::dump(Formatter *f) const {
 }
 
 void ResizePayload::encode(bufferlist &bl) const {
-  AsyncRequestPayloadBase::encode(bl);
   ::encode(size, bl);
+  AsyncRequestPayloadBase::encode(bl);
   ::encode(allow_shrink, bl);
 }
 
 void ResizePayload::decode(__u8 version, bufferlist::iterator &iter) {
-  AsyncRequestPayloadBase::decode(version, iter);
   ::decode(size, iter);
+  AsyncRequestPayloadBase::decode(version, iter);
 
   if (version >= 4) {
     ::decode(allow_shrink, iter);