Client: do not require successful remount when unmounting

Fixes: #10982
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1158fa65831bd01f8587c729a9d16ed0f14e49c7..5c4654da2f8c68fbc80b9e2ba6ef9eaa21d48988 100644 (file)
--- 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 85764884748bc8a2c543917dab72b9cb1180ba8c..d1dbebb3a603ea99d2eba4b42c5337d63a0b6196 100644 (file)
--- 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); }