From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 27 Dec 2016 03:12:11 +0000 (+0800)
Subject: mds: properly put unexpired dentry back to lru
X-Git-Tag: v12.0.0~220^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=276d12547fc02e1f82ab6163ee0fb65db854baa3;p=ceph.git

mds: properly put unexpired dentry back to lru

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index a6e7ca907b41..8d0d3a005bc9 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -6386,7 +6386,8 @@ bool MDCache::trim(int max, int count)
     if (!dn->get_linkage()->is_null()) {
       trimming_nulls = false;
       if (lru.lru_get_size() + unexpirable <= (unsigned)max) {
-        break;
+	unexpirables.push_back(dn);
+	break;
       }
     }
     if ((is_standby_replay && dn->get_linkage()->inode &&