don't open-code d_rehash() in d_materialise_unique()
... and get rid of duplicate BUG_ON() there Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
5cc3821b57
commit
8527dd7187
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue