Received: by 2002:a05:7412:e79e:b0:f3:1519:9f41 with SMTP id o30csp269228rdd; Wed, 22 Nov 2023 15:51:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsaHhEZAVM3+lO8fzAuRJzBLPChJ3v0XN3kH8qXhomGc7e53XeVgyzAKLlnbqZWMUjWzKI X-Received: by 2002:a17:903:2347:b0:1cf:837d:1e59 with SMTP id c7-20020a170903234700b001cf837d1e59mr1273139plh.25.1700697105951; Wed, 22 Nov 2023 15:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700697105; cv=none; d=google.com; s=arc-20160816; b=eVebYgrZqAhWNwNp6oPGOYDkgMldmDUYkWWfQxWPc6co/6zA5Ji3ZyWBfxI5y4iLb2 x2VLrZsG7FnpfASvdrhbFZkW8xn1TlmtmSqG+2mhDBbgHavkhZ9H9Otj/uAbU3kSOZIA zdnl0jCs1dP8r0wuj2LAKwdXB97DMBOv9hbLHNeIGlhcI5KIVaQU76oxM5wDj7fWwZ/x V0KT+tr+YCmFsQUFsIpgi5HOfjrRTC3k5SMMUQDBn29X9jxlGhTkOT29b4ycN5A7QoTK OFm9ISiSJrxdYKg1gqlof9FV1ay3kfcfA8bgf2yHnmhXXxaMEI39/YmHejE4mCeNzZdd hn+g== 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=c+NluGMH3ACG9C4v9tyqVQmooH2gf0OtbH4WLDdZuu0=; fh=onECAbG0db6bZRGkmHaHumpjquwBTTaWawDwxHY33Hs=; b=Nu4cyCaQO1oaQCrhD9I0K+06eaaQvgdTRXz2hDPwhUW+aM858clwUYIGyPk8zLRO2e VkgSO2ML4xPDIzFUNz1hX9eCE9rdjo9Gr1ypuoya9LthkPUppILXyNQo1aEOFrmFZiYD FmX8J2MTnDM04LL4yoYus3QeIqnQEH8yBEBWDAczrdtuS1id0+8Tk5jfOtwHoz0N5DRc 7DNUCqSHoki+F+e5wEJ1Cz1z9GtEP/LehAleMxOS7dMI8yCKjnHraEWPL/V+BBrvk2mu X7QaW6GtxWRt4SSAUR3uKztgWEaq68KDOckR94UibogbdmxXp2wXh1xa1iPIjMTjyX3p vWkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=BJsnfUsB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id c4-20020a170902d90400b001c9dd045ef5si422875plz.327.2023.11.22.15.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 15:51:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=BJsnfUsB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id E0CE18288CAB; Wed, 22 Nov 2023 15:51:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344247AbjKVXvi (ORCPT + 99 others); Wed, 22 Nov 2023 18:51:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344340AbjKVXva (ORCPT ); Wed, 22 Nov 2023 18:51:30 -0500 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91A381B6 for ; Wed, 22 Nov 2023 15:51:26 -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=1700697085; 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=c+NluGMH3ACG9C4v9tyqVQmooH2gf0OtbH4WLDdZuu0=; b=BJsnfUsB9ZLj8D6Kc7ijV5SCXDed20HLPXGuLTFxO8HCXbfj4PZyhQtvTG7tbFUx8tPTOF rTLXP125eU5rcyA+YdX/EbKGzKIozsWvGKwF5gD6mq4y0PelGref6XbkacJM0MZJlRTy2m CZJaVNKT/DluYq8juvZ9fNIjz/meEqE= 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 4/6] bcachefs: Use lock_class_is_held() for btree locking asserts Date: Wed, 22 Nov 2023 18:51:11 -0500 Message-ID: <20231122235113.180132-5-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 15:51:45 -0800 (PST) Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_locking.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c index 308c891ad3ca..ef84b0423deb 100644 --- a/fs/bcachefs/btree_locking.c +++ b/fs/bcachefs/btree_locking.c @@ -16,10 +16,7 @@ void bch2_btree_lock_init(struct btree_bkey_cached_common *b, #ifdef CONFIG_LOCKDEP void bch2_assert_btree_nodes_not_locked(void) { -#if 0 - //Re-enable when lock_class_is_held() is merged: BUG_ON(lock_class_is_held(&bch2_btree_node_lock_key)); -#endif } #endif -- 2.42.0