Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752868AbcDXSJS (ORCPT ); Sun, 24 Apr 2016 14:09:18 -0400 Received: from mail-qg0-f44.google.com ([209.85.192.44]:35015 "EHLO mail-qg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672AbcDXSJQ (ORCPT ); Sun, 24 Apr 2016 14:09:16 -0400 Message-ID: <1461521349.28145.2.camel@poochiereds.net> Subject: Re: [PATCH 10/15] __d_add(): don't drop/regain ->d_lock From: Jeff Layton To: Al Viro , Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Date: Sun, 24 Apr 2016 14:09:09 -0400 In-Reply-To: <1460768127-31822-10-git-send-email-viro@ZenIV.linux.org.uk> References: <20160416005232.GV25498@ZenIV.linux.org.uk> <1460768127-31822-10-git-send-email-viro@ZenIV.linux.org.uk> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1161 Lines: 41 On Sat, 2016-04-16 at 01:55 +0100, Al Viro wrote: > From: Al Viro > > Signed-off-by: Al Viro > --- >  fs/dcache.c | 14 +++++++++++--- >  1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/fs/dcache.c b/fs/dcache.c > index e9de4d9..33cad8a 100644 > --- a/fs/dcache.c > +++ b/fs/dcache.c > @@ -2363,11 +2363,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); Should the above be a new __d_instantiate_locked instead of open-coding it? > + } > + _d_rehash(dentry); > + spin_unlock(&dentry->d_lock); > + if (inode) >   spin_unlock(&inode->i_lock); > - } > - d_rehash(dentry); >  } >   >  /** -- Jeff Layton