From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 3 Mar 2015 06:29:10 +0000 (-0800)
Subject: Client: do not require successful remount when unmounting
X-Git-Tag: v0.94~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3530a25ae73bda2da63603373f1b3a56b63d8a00;p=ceph.git

Client: do not require successful remount when unmounting

Fixes: #10982

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 71f2686252ffe29d0234cc8be7304be1450d090e)
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1158fa65831b..5c4654da2f8c 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -3453,7 +3453,7 @@ public:
       client_t whoami = client->get_nodeid();
       lderr(client->cct) << "tried to remount (to trim kernel dentries) and got error "
 			 << r << dendl;
-      if (client->require_remount) {
+      if (client->require_remount && !client->unmounting) {
 	assert(0 == "failed to remount for kernel dentry trimming");
       }
     }
diff --git a/src/client/Client.h b/src/client/Client.h
index 85764884748b..d1dbebb3a603 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -421,6 +421,7 @@ protected:
   friend class C_C_Tick; // Asserts on client_lock
   friend class C_Client_SyncCommit; // Asserts on client_lock
   friend class C_Client_RequestInterrupt;
+  friend class C_Client_Remount;
 
   //int get_cache_size() { return lru.lru_get_size(); }
   //void set_cache_size(int m) { lru.lru_set_max(m); }