From: Greg Kroah-Hartman Date: Fri, 14 Aug 2015 16:50:11 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v3.10.87~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0acdcd20f4ddedba86d7ef6d89fe99a7861d054a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: expand-the-call-of-dentry_lru_del-in-dentry_kill.patch --- diff --git a/queue-3.14/expand-the-call-of-dentry_lru_del-in-dentry_kill.patch b/queue-3.14/expand-the-call-of-dentry_lru_del-in-dentry_kill.patch new file mode 100644 index 00000000000..4d866f1d124 --- /dev/null +++ b/queue-3.14/expand-the-call-of-dentry_lru_del-in-dentry_kill.patch @@ -0,0 +1,33 @@ +From 01b6035190b024240a43ac1d8e9c6f964f5f1c63 Mon Sep 17 00:00:00 2001 +From: Al Viro +Date: Tue, 29 Apr 2014 23:42:52 -0400 +Subject: expand the call of dentry_lru_del() in dentry_kill() + +From: Al Viro + +commit 01b6035190b024240a43ac1d8e9c6f964f5f1c63 upstream. + +Signed-off-by: Al Viro +Cc: "Nicholas A. Bellinger" +Signed-off-by: Greg Kroah-Hartman + +--- + fs/dcache.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -499,7 +499,12 @@ relock: + 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_entry(&dentry->d_child); diff --git a/queue-3.14/series b/queue-3.14/series index c26b1f3a7a8..89bcb3b3d17 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -33,3 +33,4 @@ signal-fix-information-leak-in-copy_siginfo_from_user32.patch fold-d_kill-and-d_free.patch fold-try_prune_one_dentry.patch new-helper-dentry_free.patch +expand-the-call-of-dentry_lru_del-in-dentry_kill.patch