Commit 0568d705 authored by Al Viro's avatar Al Viro

__d_add(): don't drop/regain ->d_lock

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1936386e
...@@ -2366,11 +2366,19 @@ EXPORT_SYMBOL(d_rehash); ...@@ -2366,11 +2366,19 @@ EXPORT_SYMBOL(d_rehash);
static inline void __d_add(struct dentry *dentry, struct inode *inode) static inline void __d_add(struct dentry *dentry, struct inode *inode)
{ {
spin_lock(&dentry->d_lock);
if (inode) { if (inode) {
__d_instantiate(dentry, inode); unsigned add_flags = d_flags_for_inode(inode);
spin_unlock(&inode->i_lock); hlist_add_head(&dentry->d_u.d_alias, &inode->i_dentry);
raw_write_seqcount_begin(&dentry->d_seq);
__d_set_inode_and_type(dentry, inode, add_flags);
raw_write_seqcount_end(&dentry->d_seq);
__fsnotify_d_instantiate(dentry);
} }
d_rehash(dentry); _d_rehash(dentry);
spin_unlock(&dentry->d_lock);
if (inode)
spin_unlock(&inode->i_lock);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment