From 0568d705b0087751f0c085c0a665aa3e954c810d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 14 Apr 2016 19:40:56 -0400 Subject: __d_add(): don't drop/regain ->d_lock Signed-off-by: Al Viro --- fs/dcache.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'fs/dcache.c') diff --git a/fs/dcache.c b/fs/dcache.c index 4962a7b4384e..20394fb6f967 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2366,11 +2366,19 @@ EXPORT_SYMBOL(d_rehash); static inline void __d_add(struct dentry *dentry, struct inode *inode) { + spin_lock(&dentry->d_lock); if (inode) { - __d_instantiate(dentry, inode); + unsigned add_flags = d_flags_for_inode(inode); + 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); + spin_unlock(&dentry->d_lock); + if (inode) spin_unlock(&inode->i_lock); - } - d_rehash(dentry); } /** -- cgit v1.2.3-55-g7522