From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49969 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755197AbbHNQuM (ORCPT ); Fri, 14 Aug 2015 12:50:12 -0400 Subject: Patch "expand the call of dentry_lru_del() in dentry_kill()" has been added to the 3.14-stable tree To: viro@zeniv.linux.org.uk, gregkh@linuxfoundation.org, nab@linux-iscsi.org Cc: , From: Date: Fri, 14 Aug 2015 09:50:11 -0700 Message-ID: <1439571011233227@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled expand the call of dentry_lru_del() in dentry_kill() to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: expand-the-call-of-dentry_lru_del-in-dentry_kill.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>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); Patches currently in stable-queue which might be from viro@zeniv.linux.org.uk are queue-3.14/new-helper-dentry_free.patch queue-3.14/fold-try_prune_one_dentry.patch queue-3.14/expand-the-call-of-dentry_lru_del-in-dentry_kill.patch queue-3.14/fold-d_kill-and-d_free.patch queue-3.14/ipc-modify-message-queue-accounting-to-not-take-kernel-data-structures-into-account.patch queue-3.14/sg_start_req-make-sure-that-there-s-not-too-many-elements-in-iovec.patch