From: Cong Wang <xiyou.wangcong@gmail.com>
To: stable@vger.kernel.org
Cc: viro@zeniv.linux.org.uk, gregkh@linuxfoundation.org,
linux-fsdevel@vger.kernel.org
Subject: [Patch 3.14 stable 04/16] expand the call of dentry_lru_del() in dentry_kill()
Date: Thu, 6 Nov 2014 11:37:08 -0800 [thread overview]
Message-ID: <1415302640-5876-5-git-send-email-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <1415302640-5876-1-git-send-email-xiyou.wangcong@gmail.com>
From: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit 01b6035190b024240a43ac1d8e9c6f964f5f1c63)
---
fs/dcache.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index d96d271..3f07e5a 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -500,7 +500,12 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
if ((dentry->d_flags & DCACHE_OP_PRUNE) && !d_unhashed(dentry))
dentry->d_op->d_prune(dentry);
- dentry_lru_del(dentry);
+ if (dentry->d_flags & DCACHE_LRU_LIST) {
+ if (!(dentry->d_flags & DCACHE_SHRINK_LIST))
+ d_lru_del(dentry);
+ else
+ d_shrink_del(dentry);
+ }
/* if it was on the hash then remove it */
__d_drop(dentry);
list_del(&dentry->d_u.d_child);
--
1.8.3.1
next prev parent reply other threads:[~2014-11-06 19:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-06 19:37 [Patch 3.14 stable 00/16] vfs: fix dentry shrink list corruption Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 01/16] fold d_kill() and d_free() Cong Wang
2015-05-18 17:44 ` Greg KH
2015-05-21 0:31 ` [PATCH 3.14] " Vinson Lee
2015-05-21 0:31 ` [PATCH] " Vinson Lee
2015-06-29 23:56 ` [PATCH 3.14] " Greg KH
2014-11-06 19:37 ` [Patch 3.14 stable 02/16] fold try_prune_one_dentry() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 03/16] new helper: dentry_free() Cong Wang
2014-11-06 19:37 ` Cong Wang [this message]
2014-11-06 19:37 ` [Patch 3.14 stable 05/16] dentry_kill(): don't try to remove from shrink list Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 06/16] don't remove from shrink list in select_collect() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 07/16] more graceful recovery in umount_collect() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 08/16] dcache: don't need rcu in shrink_dentry_list() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 09/16] lift the "already marked killed" case into shrink_dentry_list() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 10/16] split dentry_kill() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 11/16] expand dentry_kill(dentry, 0) in shrink_dentry_list() Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 12/16] shrink_dentry_list(): take parent's ->d_lock earlier Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 13/16] dealing with the rest of shrink_dentry_list() livelock Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 14/16] dentry_kill() doesn't need the second argument now Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 15/16] dcache: add missing lockdep annotation Cong Wang
2014-11-06 19:37 ` [Patch 3.14 stable 16/16] lock_parent: don't step on stale ->d_parent of all-but-freed one Cong Wang
2015-02-03 23:11 ` [Patch 3.14 stable 00/16] vfs: fix dentry shrink list corruption Greg KH
2015-02-04 3:30 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415302640-5876-5-git-send-email-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).