projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cc3821
)
don't open-code d_rehash() in d_materialise_unique()
author
Al Viro
<viro@zeniv.linux.org.uk>
Sat, 27 Sep 2014 01:26:50 +0000
(21:26 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Sat, 27 Sep 2014 01:26:50 +0000
(21:26 -0400)
... and get rid of duplicate BUG_ON() there
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/dcache.c
patch
|
blob
|
history
diff --git
a/fs/dcache.c
b/fs/dcache.c
index 36d84ec31d8a0a749cbdde6f628260f1f851427a..22107630fc031be1438f3039c3f81e1986fbcd1d 100644
(file)
--- a/
fs/dcache.c
+++ b/
fs/dcache.c
@@
-2804,12
+2804,8
@@
struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode)
actual = __d_instantiate_unique(dentry, inode);
if (!actual)
actual = dentry;
- else
- BUG_ON(!d_unhashed(actual));
- spin_lock(&actual->d_lock);
- _d_rehash(actual);
- spin_unlock(&actual->d_lock);
+ d_rehash(actual);
found:
spin_unlock(&inode->i_lock);
out_nolock: