Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: simplify __d_free

Browse Source 
Remove d_callback and always call __d_free with a RCU head.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig 2010-10-10 05:36:22 -04:00 committed by Al Viro
parent be148247cf
commit 9c82ab9c9e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/dcache.c
View File

@ -67,20 +67,16 @@ struct dentry_stat_t dentry_stat = {
.age_limit = 45, .age_limit = 45,
}; };
static void __d_free(struct dentry *dentry) static void __d_free(struct rcu_head *head)
{ {
struct dentry *dentry = container_of(head, struct dentry, d_u.d_rcu);
WARN_ON(!list_empty(&dentry->d_alias)); WARN_ON(!list_empty(&dentry->d_alias));
if (dname_external(dentry)) if (dname_external(dentry))
kfree(dentry->d_name.name); kfree(dentry->d_name.name);
kmem_cache_free(dentry_cache, dentry); kmem_cache_free(dentry_cache, dentry);
} }
static void d_callback(struct rcu_head *head)
{
struct dentry * dentry = container_of(head, struct dentry, d_u.d_rcu);
__d_free(dentry);
}
/* /*
* no dcache_lock, please. The caller must decrement dentry_stat.nr_dentry * no dcache_lock, please. The caller must decrement dentry_stat.nr_dentry
* inside dcache_lock. * inside dcache_lock.
@ -91,9 +87,9 @@ static void d_free(struct dentry *dentry)
dentry->d_op->d_release(dentry); dentry->d_op->d_release(dentry);
/* if dentry was never inserted into hash, immediate free is OK */ /* if dentry was never inserted into hash, immediate free is OK */
if (hlist_unhashed(&dentry->d_hash)) if (hlist_unhashed(&dentry->d_hash))
__d_free(dentry); __d_free(&dentry->d_u.d_rcu);
else else
call_rcu(&dentry->d_u.d_rcu, d_callback); call_rcu(&dentry->d_u.d_rcu, __d_free);
} }
/* /*