From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1291C2BA19 for ; Thu, 16 Apr 2020 01:52:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7E5A206D6 for ; Thu, 16 Apr 2020 01:52:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388419AbgDPBw5 (ORCPT ); Wed, 15 Apr 2020 21:52:57 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2334 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729270AbgDPBwt (ORCPT ); Wed, 15 Apr 2020 21:52:49 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 5F1C1FC782B87A59B108; Thu, 16 Apr 2020 09:52:47 +0800 (CST) Received: from [127.0.0.1] (10.166.215.235) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Thu, 16 Apr 2020 09:52:37 +0800 Subject: Re: [PATCH] dcache: unlock inode->i_lock before goto restart tag in, d_prune_aliases To: Eric Biggers CC: , , , , , , Yanxiaodan , Mingfangsen , "wubo (T)" References: <20200416014648.GB816@sol.localdomain> From: Zhiqiang Liu Message-ID: Date: Thu, 16 Apr 2020 09:52:36 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200416014648.GB816@sol.localdomain> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.166.215.235] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/4/16 9:46, Eric Biggers wrote: > On Wed, Apr 15, 2020 at 09:20:33PM +0800, Zhiqiang Liu wrote: >> From: Zhiqiang Liu >> >> coccicheck reports: >> fs/dcache.c:1027:1-10: second lock on line 1027 >> >> In d_prune_aliases, before goto restart we should unlock >> inode->i_lock. >> >> Fixes: 29355c3904e ("d_prune_alias(): just lock the parent and call __dentry_kill()") >> Signed-off-by: Zhiqiang Liu >> Signed-off-by: Feilong Lin >> --- >> fs/dcache.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/fs/dcache.c b/fs/dcache.c >> index b280e07e162b..1532ebe9d9ca 100644 >> --- a/fs/dcache.c >> +++ b/fs/dcache.c >> @@ -1030,6 +1030,7 @@ void d_prune_aliases(struct inode *inode) >> if (!dentry->d_lockref.count) { >> struct dentry *parent = lock_parent(dentry); >> if (likely(!dentry->d_lockref.count)) { >> + spin_unlock(&inode->i_lock); >> __dentry_kill(dentry); >> dput(parent); >> goto restart; >> -- > > Doesn't __dentry_kill() already do the unlock, via dentry_unlink_inode()? > > - Eric > Yes, you are right. Sorry for that. Please ignore this patch. > . >