update sources to v12.1.2

[ceph.git] / ceph / src / messages / MOSDPing.h

diff --git a/ceph/src/messages/MOSDPing.h b/ceph/src/messages/MOSDPing.h
index 0801e8a04ce64c4e15297c3263bf0993963dd79c..c286319ebf81ecad8f803453f48b7ff1619c7127 100644 (file)
--- a/ceph/src/messages/MOSDPing.h
+++ b/ceph/src/messages/MOSDPing.h
@@ -102,7 +102,10 @@ public:
     ::encode(map_epoch, payload);
     
     // with luminous, we drop peer_as_of_epoch and peer_stat
-    if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) { 
+    if (HAVE_FEATURE(features, SERVER_LUMINOUS)) {
+      header.version = HEAD_VERSION;
+      ::encode(op, payload);
+    } else {
       epoch_t dummy_epoch = {};
       osd_peer_stat_t dummy_stat = {};
       header.version = 3;
@@ -110,8 +113,6 @@ public:
       ::encode(dummy_epoch, payload);
       ::encode(op, payload);   
       ::encode(dummy_stat, payload);
-    } else {
-      ::encode(op, payload);
     }
     ::encode(stamp, payload);
     size_t s = 0;