new helper: dentry_free()

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 <viro@zeniv.linux.org.uk>

1 files changed, 10 insertions, 5 deletions

diff --git a/fs/dcache.c b/fs/dcache.c
index a5540d491954..dab7db10d685 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -246,6 +246,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
@@ -513,11 +522,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;
 }