From 3530a25ae73bda2da63603373f1b3a56b63d8a00 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 2 Mar 2015 22:29:10 -0800 Subject: [PATCH] Client: do not require successful remount when unmounting Fixes: #10982 Signed-off-by: Greg Farnum (cherry picked from commit 71f2686252ffe29d0234cc8be7304be1450d090e) --- src/client/Client.cc | 2 +- src/client/Client.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 1158fa65831bd..5c4654da2f8c6 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 85764884748bc..d1dbebb3a603e 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); } -- 2.39.5