msgr: Remove the SimpleMessenger start/start_with_nonce distinction.

Instead, have a settable nonce value that you can fill in any time
after construction and that it uses during regular start().

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 2450eefc082..fbdc508df68 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -90,7 +90,9 @@ int main(int argc, const char **argv, const char *envp[]) {
     return -1;
 
   // start up network
-  SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context, entity_name_t::CLIENT());
+  SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
+                                                   entity_name_t::CLIENT());
+  messenger->set_nonce(getpid());
   Client *client = new Client(messenger, &mc);
   if (filer_flags) {
     client->set_filer_flags(filer_flags);
@@ -116,7 +118,7 @@ int main(int argc, const char **argv, const char *envp[]) {
     ::close(fd[0]);
 
     cout << "ceph-fuse[" << getpid() << "]: starting ceph client" << std::endl;
-    messenger->start_with_nonce(getpid());
+    messenger->start();
 
     // start client
     client->init();