From 9db305a99fd945059a173f5ae8ae61744dd28615 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 18 Apr 2017 10:05:53 -0400 Subject: [PATCH] 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 --- src/librbd/WatchNotifyTypes.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc index 4f7f1b0d7e55d..b146eeac3a110 100644 --- a/src/librbd/WatchNotifyTypes.cc +++ b/src/librbd/WatchNotifyTypes.cc @@ -165,14 +165,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); -- 2.39.5