From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yan, Zheng" Subject: [PATCH 2/2] fs: fix dentry_lru_prune() Date: Thu, 7 Mar 2013 19:37:36 +0800 Message-ID: <1362656256-4397-1-git-send-email-zheng.z.yan@intel.com> Cc: sage@inktank.com, viro@zeniv.linux.org.uk, "Yan, Zheng" To: linux-fsdevel@vger.kernel.org, ceph-devel@vger.kernel.org Return-path: Sender: ceph-devel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: "Yan, Zheng" dentry_lru_prune() should always call file system's d_prune callback. Signed-off-by: Yan, Zheng --- fs/dcache.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 19153a0..f0060aa 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -344,14 +344,9 @@ static void dentry_lru_del(struct dentry *dentry) */ static void dentry_lru_prune(struct dentry *dentry) { - if (!list_empty(&dentry->d_lru)) { - if (dentry->d_flags & DCACHE_OP_PRUNE) - dentry->d_op->d_prune(dentry); - - spin_lock(&dcache_lru_lock); - __dentry_lru_del(dentry); - spin_unlock(&dcache_lru_lock); - } + if (dentry->d_flags & DCACHE_OP_PRUNE) + dentry->d_op->d_prune(dentry); + dentry_lru_del(dentry); } static void dentry_lru_move_list(struct dentry *dentry, struct list_head *list) -- 1.7.11.7