Patch "fold d_kill() and d_free()" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
fold d_kill() and d_free()
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:
fold-d_kill-and-d_free.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 <[email protected]> know about it.
Quoted 1 line
From
03b3b889e79cdb6b806fc0ba9be0d71c186bbfaaMon Sep 17 00:00:00 2001
From: Al Viro <[email protected]>
Date: Tue, 29 Apr 2014 15:45:28 -0400
Subject: fold d_kill() and d_free()
From: Al Viro <[email protected]>
commit 03b3b889e79cdb6b806fc0ba9be0d71c186bbfaa upstream.
--- fs/dcache.c | 77 ++++++++++++++++++------------------------------------------ 1 file changed, 24 insertions(+), 53 deletions(-)
fs/dcache.c +24 -53
@@ -244,24 +244,6 @@ static void __d_free(struct rcu_head *hekmem_cache_free (dentry_cache, dentry); } -/* -* no locks, please. -*/ -static void d_free (struct dentry *dentry) -{ -WARN_ON (!hlist_unhashed (&dentry->d_u.d_alias)); -BUG_ON ((int )dentry->d_lockref.count >0 ); -this_cpu_dec (nr_dentry); -if (dentry->d_op && dentry->d_op->d_release) - dentry->d_op->d_release (dentry); - -/* if dentry was never visible to RCU, immediate free is OK */ -if (!(dentry->d_flags &DCACHE_RCUACCESS )) -__d_free (&dentry->d_u.d_rcu); -else -call_rcu (&dentry->d_u.d_rcu, __d_free); -} -/** * dentry_rcuwalk_barrier - invalidate in-progress rcu-walk lookups * @dentry: the target dentry
@@ -419,40 +401,6 @@ static void dentry_lru_del(struct dentry }/** -* d_kill - kill dentry and return parent -* @dentry: dentry to kill -* @parent: parent dentry -* -* The dentry must already be unhashed and removed from the LRU. -* -* If this is the root of the dentry tree, return NULL. -* -* dentry->d_lock and parent->d_lock must be held by caller, and are dropped by -* d_kill. -*/ -static struct dentry *d_kill (struct dentry *dentry,struct dentry *parent) - __releases(dentry->d_lock) - __releases(parent->d_lock) - __releases(dentry->d_inode->i_lock) -{ -__list_del_entry (&dentry->d_child); -/* -* Inform d_walk() that we are no longer attached to the -* dentry tree -*/ - dentry->d_flags |=DCACHE_DENTRY_KILLED ; -if (parent) -spin_unlock (&parent->d_lock); -dentry_iput (dentry); -/* -* dentry_iput drops the locks, at which point nobody (except -* transient RCU lookups) can reach this dentry. -*/ -d_free (dentry); -return parent; -} - -/** * d_drop - drop a dentry * @dentry: dentry to drop *
@@ -545,7 +493,30 @@ relock:dentry_lru_del (dentry);/* if it was on the hash then remove it */ __d_drop (dentry); -return d_kill (dentry, parent); +__list_del_entry (&dentry->d_child); +/* +* Inform d_walk() that we are no longer attached to the +* dentry tree +*/ + dentry->d_flags |=DCACHE_DENTRY_KILLED ; +if (parent) +spin_unlock (&parent->d_lock); +dentry_iput (dentry); +/* +* dentry_iput drops the locks, at which point nobody (except +* transient RCU lookups) can reach this dentry. +*/ +BUG_ON ((int )dentry->d_lockref.count >0 ); +this_cpu_dec (nr_dentry); +if (dentry->d_op && dentry->d_op->d_release) + dentry->d_op->d_release (dentry); + +/* if dentry was never visible to RCU, immediate free is OK */ +if (!(dentry->d_flags &DCACHE_RCUACCESS )) +__d_free (&dentry->d_u.d_rcu); +else +call_rcu (&dentry->d_u.d_rcu, __d_free); +return parent; }/*
Patches currently in stable-queue which might be from [email protected] are
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