libcephfs: delete client after messenger shutdown

Prevents race between messages being dispatched to the client after the
client has been free'd.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index 0bb508ff912..6323918eadf 100644
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -123,8 +123,6 @@ public:
     }
     if (client) {
       client->shutdown();
-      delete client;
-      client = NULL;
     }
     if (messenger) {
       messenger->shutdown();
@@ -136,6 +134,10 @@ public:
       delete monclient;
       monclient = NULL;
     }
+    if (client) {
+      delete client;
+      client = NULL;
+    }
   }
 
   bool is_mounted()