Merge pull request #3856 from ceph/wip-10982

RFC Client: do not require successful remount when unmounting
This commit is contained in:
Yan, Zheng 2015-03-03 15:16:56 +08:00
commit 2e86094352
2 changed files with 2 additions and 1 deletions

View File

@ -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");
}
}

View File

@ -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); }