Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3549070pxj; Tue, 15 Jun 2021 03:29:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe3hud7wEBrOYYAU6AnMgJdrxBN6qKgriZwlAHlnb0QKna06YWdOjtuFb5FyH7by3oBI9G X-Received: by 2002:a17:907:2b26:: with SMTP id gc38mr20075551ejc.31.1623752959073; Tue, 15 Jun 2021 03:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623752959; cv=none; d=google.com; s=arc-20160816; b=lfrJ2WgDmg5xiicgb+aqU50ffGYaPnZ6FhEWVEkvYmvaCuAv5Ry5Adu4K00+be3akH aQiQ9UMRs4f42OmozjKkBlRaay9OpfKhBR0P+4DoSEHdNfCBn6bxabvcB57M1yDdSBv1 KQCHJPGtMqNilQkxtRBsRJo2dkmWgbT5Trhw6oS8+s8dfUdsG4PeWM+c1T5DLCW0yX4K vZ2MbJ99W67a7nhU/PRr9vWH3vShzER+Uv/ysTKf+2cpRSnqZtoeZyYOUc+OXAUJcB2w 9LRaz30hJzRDUu4c+rIzpk2dH0PSIqh90sXlD79CiGtb+4agkXjnqgKSdpF9xvhS5Ab7 Rh5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=sOJ3aDDoQB6kg+q6twAtDiZWPIhMiphGbaKTWwfPnHc=; b=vY1es3J6h2AfVV/zlbhzeiYY8DCKPrXyA6j6rts/GcsAQ0gc6Kz01wosCIWqvUqP1F 2whNkdoAWmXnwGbLz5qOszh2JFRu6LAxs1uBtUmIwFyaIAdq/8GrFZ/SCEqg/iS7Dx4N U1IjPGwFKvRcJyoJJuf3+7cvb7jkKxwrWnH5B4DZaO6VQJS8HnFACV2aQU2D0jBVegrs Ab8mKzFhgdNYxqSRy7EnEnSuM6/ro05qh9Xhaa7iOtijigFyuGWst8CHmYj9/4BSYW0K SllAIz4f7pvbUcbd7WRLq3IW0m8oK0hOVz3Q2hWo4aDd9wuXqjHzJRGRvCM1Jl6M7d2Y ycIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j15si14044172edq.337.2021.06.15.03.28.56; Tue, 15 Jun 2021 03:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231697AbhFOK3b convert rfc822-to-8bit (ORCPT + 99 others); Tue, 15 Jun 2021 06:29:31 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:53924 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231686AbhFOK3Y (ORCPT ); Tue, 15 Jun 2021 06:29:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-518-DOPPCgdoPuuodX4AY4s6FQ-1; Tue, 15 Jun 2021 06:27:16 -0400 X-MC-Unique: DOPPCgdoPuuodX4AY4s6FQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BBD2A40C0; Tue, 15 Jun 2021 10:27:15 +0000 (UTC) Received: from web.messagingengine.com (ovpn-116-40.sin2.redhat.com [10.67.116.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 596A060C0F; Tue, 15 Jun 2021 10:27:07 +0000 (UTC) Subject: [PATCH v7 6/6] kernfs: dont call d_splice_alias() under kernfs node lock From: Ian Kent To: Greg Kroah-Hartman , Tejun Heo Cc: Eric Sandeen , Fox Chen , Brice Goglin , Al Viro , Rick Lindsley , David Howells , Miklos Szeredi , Marcelo Tosatti , "Eric W. Biederman" , Carlos Maiolino , linux-fsdevel , Kernel Mailing List Date: Tue, 15 Jun 2021 18:27:06 +0800 Message-ID: <162375282484.232295.17118280961409351125.stgit@web.messagingengine.com> In-Reply-To: <162375263398.232295.14755578426619198534.stgit@web.messagingengine.com> References: <162375263398.232295.14755578426619198534.stgit@web.messagingengine.com> User-Agent: StGit/0.23 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=raven@themaw.net X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: themaw.net Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The call to d_splice_alias() in kernfs_iop_lookup() doesn't depend on any kernfs node so there's no reason to hold the kernfs node lock when calling it. Signed-off-by: Ian Kent Reviewed-by: Miklos Szeredi --- fs/kernfs/dir.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index a5080fb1dfc05..723348607033c 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1097,7 +1097,6 @@ static struct dentry *kernfs_iop_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) { - struct dentry *ret; struct kernfs_node *parent = dir->i_private; struct kernfs_node *kn; struct inode *inode = NULL; @@ -1117,11 +1116,10 @@ static struct dentry *kernfs_iop_lookup(struct inode *dir, /* Needed only for negative dentry validation */ if (!inode) kernfs_set_rev(parent, dentry); - /* instantiate and hash (possibly negative) dentry */ - ret = d_splice_alias(inode, dentry); up_read(&kernfs_rwsem); - return ret; + /* instantiate and hash (possibly negative) dentry */ + return d_splice_alias(inode, dentry); } static int kernfs_iop_mkdir(struct user_namespace *mnt_userns,