From: Al Viro Date: Wed, 30 Apr 2014 03:40:14 +0000 (-0400) Subject: new helper: dentry_free() X-Git-Tag: v3.12.32~132 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2dab9fb82b262313ecd36454beea93adb73aea3;p=thirdparty%2Fkernel%2Fstable.git new helper: dentry_free() commit b4f0354e968f5fabd39bc85b99fedae4a97589fe 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: Al Viro Signed-off-by: Jiri Slaby --- diff --git a/fs/dcache.c b/fs/dcache.c index 533a44b8e021d..362aa79c90b3c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -274,6 +274,15 @@ static void __d_free(struct rcu_head *head) 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: the target dentry @@ -535,11 +544,7 @@ relock: 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_free(dentry); return parent; }