From: Amnon Hanuhov <ahanukov@redhat.com>
Date: Thu, 8 Apr 2021 14:16:55 +0000 (+0300)
Subject: messages: Add crimson's make_message as friend to messages classes with
X-Git-Tag: v17.1.0~2024^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4aad45133a439f6088442686246c0bff7b4baf5e;p=ceph.git

messages: Add crimson's make_message as friend to messages classes with
protected and/or private ctors

Signed-off-by: Amnon Hanuhov <ahanukov@redhat.com>
---

diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
index 1c9334ba0475f..260fefde44aeb 100644
--- a/src/messages/MCacheExpire.h
+++ b/src/messages/MCacheExpire.h
@@ -105,6 +105,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 WRITE_CLASS_ENCODER(MCacheExpire::realm)
diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
index 1524dd25cc84b..6eced055187f9 100644
--- a/src/messages/MClientCapRelease.h
+++ b/src/messages/MClientCapRelease.h
@@ -52,6 +52,8 @@ class MClientCapRelease final : public SafeMessage {
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index afde190bf3322..4793ff415f48d 100644
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -342,6 +342,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
index cad0f3f215595..7649e99d1c6b4 100644
--- a/src/messages/MClientLease.h
+++ b/src/messages/MClientLease.h
@@ -90,6 +90,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientMetrics.h b/src/messages/MClientMetrics.h
index 5e4234c69bb2a..2a8f1f47f8267 100644
--- a/src/messages/MClientMetrics.h
+++ b/src/messages/MClientMetrics.h
@@ -49,6 +49,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif // CEPH_MDS_CLIENT_METRICS_H
diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h
index 4dad9f1d00e00..e13a7894718a7 100644
--- a/src/messages/MClientQuota.h
+++ b/src/messages/MClientQuota.h
@@ -49,6 +49,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientReclaim.h b/src/messages/MClientReclaim.h
index f3f0ff09edc5c..81590c236e645 100644
--- a/src/messages/MClientReclaim.h
+++ b/src/messages/MClientReclaim.h
@@ -61,6 +61,8 @@ private:
 
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientReclaimReply.h b/src/messages/MClientReclaimReply.h
index 354906cd4d2dd..d51bc835884c2 100644
--- a/src/messages/MClientReclaimReply.h
+++ b/src/messages/MClientReclaimReply.h
@@ -67,6 +67,8 @@ private:
 
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index 43c5a4076872d..a8268acc7b4c7 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -170,6 +170,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 
diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
index bd58e0883ab0d..f52d1f023275d 100644
--- a/src/messages/MClientReply.h
+++ b/src/messages/MClientReply.h
@@ -400,6 +400,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index 6977c71f07c10..a4e6ec79c52d8 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -322,6 +322,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 WRITE_CLASS_ENCODER(MClientRequest::Release)
diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h
index 5c1eebd4b15d2..b48aedb20928f 100644
--- a/src/messages/MClientRequestForward.h
+++ b/src/messages/MClientRequestForward.h
@@ -67,6 +67,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
index 19dc30f256a14..d6a9826a12e16 100644
--- a/src/messages/MClientSession.h
+++ b/src/messages/MClientSession.h
@@ -94,6 +94,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
index 75178bffad16f..fade84aa24c05 100644
--- a/src/messages/MClientSnap.h
+++ b/src/messages/MClientSnap.h
@@ -66,6 +66,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
index c461105bcf4f7..803172fa81659 100644
--- a/src/messages/MDentryLink.h
+++ b/src/messages/MDentryLink.h
@@ -75,6 +75,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
index 02edb92fb3054..2925f52ec4212 100644
--- a/src/messages/MDentryUnlink.h
+++ b/src/messages/MDentryUnlink.h
@@ -66,6 +66,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
index 47ea3a7f44aa8..df1d2c686f775 100644
--- a/src/messages/MDirUpdate.h
+++ b/src/messages/MDirUpdate.h
@@ -93,6 +93,8 @@ private:
   static constexpr int COMPAT_VERSION = 1;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
index 7b69981b4df86..44536bcd2ff5a 100644
--- a/src/messages/MDiscover.h
+++ b/src/messages/MDiscover.h
@@ -95,6 +95,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
index e2d11d0fb7af4..2de4592582aab 100644
--- a/src/messages/MDiscoverReply.h
+++ b/src/messages/MDiscoverReply.h
@@ -210,6 +210,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
index 63cf927e889da..01220dcba5350 100644
--- a/src/messages/MExportCaps.h
+++ b/src/messages/MExportCaps.h
@@ -59,6 +59,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
index 1ac62fdd4f53c..83a766525c284 100644
--- a/src/messages/MExportCapsAck.h
+++ b/src/messages/MExportCapsAck.h
@@ -53,6 +53,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
index 882aecfca30db..643fc5002ad53 100644
--- a/src/messages/MExportDir.h
+++ b/src/messages/MExportDir.h
@@ -61,6 +61,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
index 4728cc3ab86a5..be9c8c4cb2939 100644
--- a/src/messages/MExportDirAck.h
+++ b/src/messages/MExportDirAck.h
@@ -53,6 +53,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
index 50bba26792c7d..b5ab08b0d0d01 100644
--- a/src/messages/MExportDirCancel.h
+++ b/src/messages/MExportDirCancel.h
@@ -53,6 +53,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
index 91d62a49b78a6..8108ebfd2daa3 100644
--- a/src/messages/MExportDirDiscover.h
+++ b/src/messages/MExportDirDiscover.h
@@ -68,6 +68,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
index b33ed07a57634..78de063acd438 100644
--- a/src/messages/MExportDirDiscoverAck.h
+++ b/src/messages/MExportDirDiscoverAck.h
@@ -64,6 +64,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
index 5cbf9ae292c3b..eec90def3fab8 100644
--- a/src/messages/MExportDirFinish.h
+++ b/src/messages/MExportDirFinish.h
@@ -58,6 +58,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
index bad8f82a09ccb..4e458e27b0d04 100644
--- a/src/messages/MExportDirNotify.h
+++ b/src/messages/MExportDirNotify.h
@@ -85,6 +85,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
index 71ffafc145dbc..2f7631221dc33 100644
--- a/src/messages/MExportDirNotifyAck.h
+++ b/src/messages/MExportDirNotifyAck.h
@@ -57,7 +57,9 @@ public:
   }
 private:
   template<class T, typename... Args>
-  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);  
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
index 4a456d517bc26..ab2d0c568e244 100644
--- a/src/messages/MExportDirPrep.h
+++ b/src/messages/MExportDirPrep.h
@@ -88,6 +88,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
index 1d5456ac8fbb0..d557934bee8fd 100644
--- a/src/messages/MExportDirPrepAck.h
+++ b/src/messages/MExportDirPrepAck.h
@@ -59,6 +59,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h
index f3f05b94e57f6..49648fb672939 100644
--- a/src/messages/MGatherCaps.h
+++ b/src/messages/MGatherCaps.h
@@ -34,6 +34,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index 40c1042b6a80c..b09f2dc3ac72b 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -61,6 +61,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
index e2a189ec42c34..365e3da3fb6e4 100644
--- a/src/messages/MInodeFileCaps.h
+++ b/src/messages/MInodeFileCaps.h
@@ -58,6 +58,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MLock.h b/src/messages/MLock.h
index 25dd718f83ac9..134d67a8a7174 100644
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@ -101,6 +101,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
index 068cc02e1037f..7cea31ee05d8d 100644
--- a/src/messages/MMDSBeacon.h
+++ b/src/messages/MMDSBeacon.h
@@ -317,6 +317,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
index 6f13ccd105572..282d01dda762a 100644
--- a/src/messages/MMDSCacheRejoin.h
+++ b/src/messages/MMDSCacheRejoin.h
@@ -343,6 +343,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
index 09f8e72ffc6f9..0096eab6536c1 100644
--- a/src/messages/MMDSFindIno.h
+++ b/src/messages/MMDSFindIno.h
@@ -50,6 +50,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h
index eef8e692627a5..a814222d528fc 100644
--- a/src/messages/MMDSFindInoReply.h
+++ b/src/messages/MMDSFindInoReply.h
@@ -50,6 +50,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h
index 7ae5829f9e0ea..1148ce6f918e7 100644
--- a/src/messages/MMDSFragmentNotify.h
+++ b/src/messages/MMDSFragmentNotify.h
@@ -70,7 +70,9 @@ public:
   }
 private:
   template<class T, typename... Args>
-  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);  
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);  
 };
 
 #endif
diff --git a/src/messages/MMDSFragmentNotifyAck.h b/src/messages/MMDSFragmentNotifyAck.h
index 4d60a732ebe01..13564cf98378b 100644
--- a/src/messages/MMDSFragmentNotifyAck.h
+++ b/src/messages/MMDSFragmentNotifyAck.h
@@ -57,6 +57,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h
index bab923db03f7f..91dc86d11e1cb 100644
--- a/src/messages/MMDSLoadTargets.h
+++ b/src/messages/MMDSLoadTargets.h
@@ -58,6 +58,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index c3bf2bc5a1237..3404f8c1fdef0 100644
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -84,6 +84,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSMetrics.h b/src/messages/MMDSMetrics.h
index 1cb74188017fa..beafd92875fd2 100644
--- a/src/messages/MMDSMetrics.h
+++ b/src/messages/MMDSMetrics.h
@@ -48,6 +48,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif // CEPH_MDS_METRICS_H
diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h
index b51795338efce..047b6ba78c438 100644
--- a/src/messages/MMDSOpenIno.h
+++ b/src/messages/MMDSOpenIno.h
@@ -54,6 +54,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h
index a331b5f8b4066..714a55d92d3fa 100644
--- a/src/messages/MMDSOpenInoReply.h
+++ b/src/messages/MMDSOpenInoReply.h
@@ -59,6 +59,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSPeerRequest.h b/src/messages/MMDSPeerRequest.h
index 389f8b96bbd37..4c74c28d5dfe0 100644
--- a/src/messages/MMDSPeerRequest.h
+++ b/src/messages/MMDSPeerRequest.h
@@ -228,6 +228,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSPing.h b/src/messages/MMDSPing.h
index 6c1f2f20edebd..992c856d92e95 100644
--- a/src/messages/MMDSPing.h
+++ b/src/messages/MMDSPing.h
@@ -45,6 +45,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif // CEPH_MESSAGES_MMDSPING_H
diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h
index d636bdcd559ed..c403e9b8e70ad 100644
--- a/src/messages/MMDSResolve.h
+++ b/src/messages/MMDSResolve.h
@@ -148,6 +148,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 inline std::ostream& operator<<(std::ostream& out, const MMDSResolve::peer_request&) {
diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h
index 727f83f450cc2..7bc9f20095e25 100644
--- a/src/messages/MMDSResolveAck.h
+++ b/src/messages/MMDSResolveAck.h
@@ -60,6 +60,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSScrub.h b/src/messages/MMDSScrub.h
index b4f4ce55b82e6..5e05e213b2d3b 100644
--- a/src/messages/MMDSScrub.h
+++ b/src/messages/MMDSScrub.h
@@ -121,7 +121,9 @@ protected:
   ~MMDSScrub() override {}
 private:
   template<class T, typename... Args>
-    friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 
   static constexpr unsigned FLAG_INTERNAL_TAG	= 1<<0;
   static constexpr unsigned FLAG_FORCE		= 1<<1;
diff --git a/src/messages/MMDSScrubStats.h b/src/messages/MMDSScrubStats.h
index 41c403adea751..5f3700745c3d8 100644
--- a/src/messages/MMDSScrubStats.h
+++ b/src/messages/MMDSScrubStats.h
@@ -75,6 +75,8 @@ private:
 
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSSnapUpdate.h b/src/messages/MMDSSnapUpdate.h
index 51b9760247eba..f3ea8103f807d 100644
--- a/src/messages/MMDSSnapUpdate.h
+++ b/src/messages/MMDSSnapUpdate.h
@@ -58,6 +58,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h
index 365d5fb59fb36..b82d9813b27b5 100644
--- a/src/messages/MMDSTableRequest.h
+++ b/src/messages/MMDSTableRequest.h
@@ -65,6 +65,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMgrConfigure.h b/src/messages/MMgrConfigure.h
index 7b27c9064eb37..368e689c065b3 100644
--- a/src/messages/MMgrConfigure.h
+++ b/src/messages/MMgrConfigure.h
@@ -81,6 +81,8 @@ private:
   using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMgrDigest.h b/src/messages/MMgrDigest.h
index 69f3368683a56..3ab32daaf2011 100644
--- a/src/messages/MMgrDigest.h
+++ b/src/messages/MMgrDigest.h
@@ -53,6 +53,8 @@ private:
   using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMgrMap.h b/src/messages/MMgrMap.h
index 9f16130bebda4..ed5230fe0bd60 100644
--- a/src/messages/MMgrMap.h
+++ b/src/messages/MMgrMap.h
@@ -53,6 +53,8 @@ private:
   using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMgrOpen.h b/src/messages/MMgrOpen.h
index c5061a281caec..8142f5be6e124 100644
--- a/src/messages/MMgrOpen.h
+++ b/src/messages/MMgrOpen.h
@@ -92,6 +92,8 @@ private:
   using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h
index 5cd5f3d5442a4..3ab1bcdbe1897 100644
--- a/src/messages/MMgrReport.h
+++ b/src/messages/MMgrReport.h
@@ -197,6 +197,8 @@ private:
   using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index d50a5c0ffe05a..8afb32c21a2da 100644
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -138,7 +138,7 @@ public:
   }
 private:
   template<class T, typename... Args>
-  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);  
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif
diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h
index c0217f8322af9..66ce359b705aa 100644
--- a/src/messages/MRemoveSnaps.h
+++ b/src/messages/MRemoveSnaps.h
@@ -51,6 +51,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::net::make_message(Args&&... args);
 };
 
 #endif