Received: by 2002:a05:7412:e79e:b0:f3:1519:9f41 with SMTP id o30csp269520rdd; Wed, 22 Nov 2023 15:52:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVmaKcsqUq/Ds6a2h7YJz4jQ+epBXiOiAkrf1WK3x+dwpnoLcDHXuS7v0d1RpElNrOj6/4 X-Received: by 2002:a05:6a20:c189:b0:189:a6b3:ef7e with SMTP id bg9-20020a056a20c18900b00189a6b3ef7emr5244398pzb.28.1700697154034; Wed, 22 Nov 2023 15:52:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700697154; cv=none; d=google.com; s=arc-20160816; b=VDK++40CqvcLgDs+UZ3Ryybuhnlms7VsqNgJnJ+on3Pwn4J5fzmDKx1KV8B8++24oW 3O5k5hrlgETiHsVu2jTJRo2rmPflYM/iLQSjrrfkzAR7U5PX8yxY92hhUzVjCI9fQ9/0 WMr4v9AiIgX1ZWOKDWEos1cCFmnmdAfysnxsXbN0q7ceI3qNmrnLqNFJ5b095lNn9Id0 J3cHMOCmfvbEO9045tDq5Brm2RxvzdWDWqnF1XceYIIwZnj4RZV7OyIIVwy3e0ir4cFC PCXOF7zbcC4n2xYKRTtEGwidnhEXpyNbuB+SmRydki4YGRIemeAa1Dlpct3DDlUOMlOa Igqg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Myq1bmeGBQIlDgNEhC6NfEwTgajaz4KUdFS8x/+ovE0=; fh=onECAbG0db6bZRGkmHaHumpjquwBTTaWawDwxHY33Hs=; b=Yldekydm9hJfI0TxKXQbIMv3fBwQL/ltr8wU+sczT3UUowuFglHFIdSuzvnIlR//LZ w3Jhth0Zg5ePmEAYXnkgRE2yJZ1NAxYh5KhiU8uwJTAwsXOAsIcxOYnTNSSrNhjVKNI0 rR5KxASnX6gJeauoHMvPsWRudOw9ThpneWoa2Sc/OWjcNTklieDA7Y34OblRyR8rN8D7 9U98/JaUWpC6Nzonf14BpJEuTx6FQSjX9aQo55fxZ44qD2Hy2q6MjXVGwdHCFUTcd7U4 0yOHc9UHVN5rqN/x66megN6FoY3xv8kseRh9Ia8EoEVbg9BmvvJ7z/NTsR//ORDA4GCD 2l+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=A6re6fRt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id b21-20020a170902d31500b001c62cfff799si447440plc.176.2023.11.22.15.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 15:52:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=A6re6fRt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 572078303A23; Wed, 22 Nov 2023 15:52:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344554AbjKVXvs (ORCPT + 99 others); Wed, 22 Nov 2023 18:51:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344503AbjKVXve (ORCPT ); Wed, 22 Nov 2023 18:51:34 -0500 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF7931B9 for ; Wed, 22 Nov 2023 15:51:28 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1700697087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Myq1bmeGBQIlDgNEhC6NfEwTgajaz4KUdFS8x/+ovE0=; b=A6re6fRtOjUFuLPZzy5AdlBTwdRPq7aLxjX6JGSBeKgnLzPIC/GD5yVCd0FuncsK/NGqOp 7tuaaJJEUaw9FtVUiLOsADzufm1rX2U9EunUFQgJ1EW5LuRubvAKm9IXTo+TkZIcY5CZWA IiqZmoHO5PULFkkEhUpY6ZlHc4YKmEY= From: Kent Overstreet To: linux-kernel@vger.kernel.org, linux-bcachefs@vger.kernel.org, peterz@infradead.org Cc: boqun.feng@gmail.com, longman@redhat.com, will@kernel.org, mingo@redhat.com, Kent Overstreet Subject: [PATCH 6/6] bcachefs: Switch to lockdep_set_no_check_recursion() Date: Wed, 22 Nov 2023 18:51:13 -0500 Message-ID: <20231122235113.180132-7-kent.overstreet@linux.dev> In-Reply-To: <20231122235113.180132-1-kent.overstreet@linux.dev> References: <20231122235113.180132-1-kent.overstreet@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 22 Nov 2023 15:52:31 -0800 (PST) Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_locking.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c index ef84b0423deb..59c57c585a4c 100644 --- a/fs/bcachefs/btree_locking.c +++ b/fs/bcachefs/btree_locking.c @@ -10,7 +10,9 @@ void bch2_btree_lock_init(struct btree_bkey_cached_common *b, enum six_lock_init_flags flags) { __six_lock_init(&b->lock, "b->c.lock", &bch2_btree_node_lock_key, flags); - lockdep_set_novalidate_class(&b->lock); +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_set_no_check_recursion(&b->lock.dep_map); +#endif } #ifdef CONFIG_LOCKDEP -- 2.42.0