From ef24b4ec7245959b1960a415617439bc3baac9a3 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Oct 2014 21:20:08 -0700
Subject: [PATCH] librados: use Messenger factory method

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5a860bec48348ed4c09256ccd394b33ace6b4f52)
---
 src/librados/RadosClient.cc | 5 +++--
 src/librados/RadosClient.h  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index a5e77a551a765..74dda533e47d7 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -30,7 +30,7 @@
 
 #include "messages/MWatchNotify.h"
 #include "messages/MLog.h"
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 // needed for static_cast
 #include "messages/PaxosServiceMessage.h"
@@ -222,7 +222,8 @@ int librados::RadosClient::connect()
 
   err = -ENOMEM;
   nonce = getpid() + (1000000 * (uint64_t)rados_instance.inc());
-  messenger = new SimpleMessenger(cct, entity_name_t::CLIENT(-1), "radosclient", nonce);
+  messenger = Messenger::create(cct, entity_name_t::CLIENT(-1),
+				"radosclient", nonce);
   if (!messenger)
     goto out;
 
diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index e608ced8d8e30..3e12b55e02827 100644
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -33,7 +33,7 @@ struct md_config_t;
 class Message;
 class MWatchNotify;
 class MLog;
-class SimpleMessenger;
+class Messenger;
 
 class librados::RadosClient : public Dispatcher
 {
@@ -49,7 +49,7 @@ private:
 
   OSDMap osdmap;
   MonClient monclient;
-  SimpleMessenger *messenger;
+  Messenger *messenger;
 
   uint64_t instance_id;
 
-- 
2.39.5