Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8527dd71 authored by Al Viro's avatar Al Viro
Browse files

don't open-code d_rehash() in d_materialise_unique() 



... and get rid of duplicate BUG_ON() there

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5cc3821b

fs/dcache.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -2804,12 +2804,8 @@ struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) 
	actual = __d_instantiate_unique(dentry, inode);

	actual = __d_instantiate_unique(dentry, inode);

	if (!actual)

	if (!actual)

		actual = dentry;

		actual = dentry;

	else

		BUG_ON(!d_unhashed(actual));





	spin_lock(&actual->d_lock);

	d_rehash(actual);

	_d_rehash(actual);

	spin_unlock(&actual->d_lock);

found:

found:

	spin_unlock(&inode->i_lock);

	spin_unlock(&inode->i_lock);

out_nolock:

out_nolock: