Commit b4f0354e authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5c47e6d0

fs/dcache.c

+10 −5
Original line number Diff line number Diff line
@@ -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 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure) 
	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;

}