Commit 5d81116c authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman

new helper: dentry_free()

commit b4f0354e upstream.

The part of old d_free() that dealt with actual freeing of dentry.
Taken out of dentry_kill() into a separate function.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a76c1ead
...@@ -244,6 +244,15 @@ static void __d_free(struct rcu_head *head) ...@@ -244,6 +244,15 @@ static void __d_free(struct rcu_head *head)
kmem_cache_free(dentry_cache, dentry); kmem_cache_free(dentry_cache, dentry);
} }
static void dentry_free(struct dentry *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_rcuwalk_barrier - invalidate in-progress rcu-walk lookups
* @dentry: the target dentry * @dentry: the target dentry
...@@ -511,11 +520,7 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure) ...@@ -511,11 +520,7 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
if (dentry->d_op && dentry->d_op->d_release) if (dentry->d_op && dentry->d_op->d_release)
dentry->d_op->d_release(dentry); dentry->d_op->d_release(dentry);
/* if dentry was never visible to RCU, immediate free is OK */ dentry_free(dentry);
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; return parent;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment