From patchwork Tue Sep 12 21:24:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 138518 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp783440vqx; Tue, 12 Sep 2023 18:15:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCOhJ/LVYDBv4WTKr4q4NeZ2YGBYc2E1W2x7HvOn4DCTh01awKAmz1SbJnOjfj6bel/Run X-Received: by 2002:a05:620a:459e:b0:76d:af99:3af1 with SMTP id bp30-20020a05620a459e00b0076daf993af1mr1100375qkb.52.1694567708749; Tue, 12 Sep 2023 18:15:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694567708; cv=none; d=google.com; s=arc-20160816; b=rEai7Mk59x1ew1EeIofZDEJ1eeOy099ZgD5IQT0hhi3LIBUAv8JZrCXpC5a9mXj6cF +zGC2M8fK9UqLmMW7nhNSwG6Ts6K7zKnGZanH4MOPB4gD4OPhZ/y5NujrLVPKxA51JFJ K5d7DD1h+NDcB7YfN6mf2f87tPH43RAKTBx7uaGlm4oSkIuzLLE4AJOCk4Kp2yBivd+t RrA49imQPq96xpBXFaExynKTyM3vPxKcBTCf7jORSqw5sq+tL6lpbXQaAMGb3gkm+4CA ntIi9SPbIUqLfOUZWwD/Buc8dLEHsL1j9+tFiLNcV7ikF0mlSORSxUGWaF6lC+bcjo9X ijIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=jZldZ6FzgGIkB4n5JjYCqAXbDRmx3rgE6t5aZlXUzQQ=; fh=4hWYXOZPVnsazVJtA2U9efwFkVrBftMezeKsFlHg7DA=; b=sYM2k4Rx/bRVGguYBw7VTmTXUW8G7Gb+oLrAVBhXHlFUjQwvRfW0hERHAR4kpjBBJN 6UnXlA+jEeUcepbxtVgjcMNkJbbwoHhMB9ddPvAJYAOCZn0z6PAJBLyyN9qtzVbiswly zRil18kQ2bDz7LWfEkij0OUPocI3Dhlb1Emys1MY88PXQ3pOCMzG1dIyglABbdskPUfo VvKzjjBcKEFJopx9n3WbZueZuTZLFKkhu44/Z07GhHd4w8WcfhP0m1Azi2w4pxP7rGcj rAj+SUwrj4jJs0iVRrDtPALLwilIqzCYYLmN8sbaOPlks273af71aTQgt9CJWcn2Qiz2 vfnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b="m/fnUywL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id i67-20020a636d46000000b00573fc592e9dsi6828225pgc.848.2023.09.12.18.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 18:15:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b="m/fnUywL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8A6DD801B432; Tue, 12 Sep 2023 14:25:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234525AbjILVZH (ORCPT + 36 others); Tue, 12 Sep 2023 17:25:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbjILVZF (ORCPT ); Tue, 12 Sep 2023 17:25:05 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4409E10CA; Tue, 12 Sep 2023 14:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694553899; bh=NKLXqb0OTt/gDVyckuS9hnUIcdyDYJz4twSlaN6jocE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=m/fnUywLcsP6wGMnWNl9RMjm0WoTwQUOLqDKFMmas5l9D4SXmRYKaqf2KkQASzQA+ 7XhQse8OReVidA2BtVl/+2+dR5TbVqmzsxqh+NFnI+YXryMz2vcsf84v8LDSCdO1jD GKmI+LINZOWmnWBCTc0uivYpF5icc7yKGlJEhPLE= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 12 Sep 2023 23:24:40 +0200 Subject: [PATCH 1/5] bcachefs: Delete dead code MIME-Version: 1.0 Message-Id: <20230912-bcachefs-cleanup-v1-1-c1f717424e6a@weissschuh.net> References: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> In-Reply-To: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> To: Kent Overstreet , Brian Foster Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694553898; l=2720; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=NKLXqb0OTt/gDVyckuS9hnUIcdyDYJz4twSlaN6jocE=; b=bkf/0H8Z0N0BPxYCBVfnCv2iymBVc+pJaHcnRTyFKOZGKX2Fikzq32KyRqIZ1P+rz7GSSwV5j ygPTVXj1SXrCUqPMKwFeM8FZZe8Pwq8YpGFuo0DMlOtEyNNwI/rBt8/ X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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]); Tue, 12 Sep 2023 14:25:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776883029903935875 X-GMAIL-MSGID: 1776883029903935875 It is not used, might as well delete it. Signed-off-by: Thomas Weißschuh --- fs/bcachefs/btree_update.c | 11 ----------- fs/bcachefs/btree_update.h | 1 - fs/bcachefs/fs-io-pagecache.c | 7 ------- fs/bcachefs/reflink.c | 8 -------- 4 files changed, 27 deletions(-) diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c index 880ce7431894..3dcb05b51e2d 100644 --- a/fs/bcachefs/btree_update.c +++ b/fs/bcachefs/btree_update.c @@ -871,17 +871,6 @@ __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt, return ret; } -int bch2_fs_log_msg(struct bch_fs *c, const char *fmt, ...) -{ - va_list args; - int ret; - - va_start(args, fmt); - ret = __bch2_fs_log_msg(c, 0, fmt, args); - va_end(args); - return ret; -} - /* * Use for logging messages during recovery to enable reserved space and avoid * blocking. diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h index 901c42b57c35..c6ab11c76cc3 100644 --- a/fs/bcachefs/btree_update.h +++ b/fs/bcachefs/btree_update.h @@ -114,7 +114,6 @@ void bch2_trans_commit_hook(struct btree_trans *, struct btree_trans_commit_hook *); int __bch2_trans_commit(struct btree_trans *, unsigned); -int bch2_fs_log_msg(struct bch_fs *, const char *, ...); int bch2_journal_log_msg(struct bch_fs *, const char *, ...); /** diff --git a/fs/bcachefs/fs-io-pagecache.c b/fs/bcachefs/fs-io-pagecache.c index 1e60eead2981..c38f002215cd 100644 --- a/fs/bcachefs/fs-io-pagecache.c +++ b/fs/bcachefs/fs-io-pagecache.c @@ -73,13 +73,6 @@ int bch2_write_invalidate_inode_pages_range(struct address_space *mapping, return ret; } -static const char * const bch2_folio_sector_states[] = { -#define x(n) #n, - BCH_FOLIO_SECTOR_STATE() -#undef x - NULL -}; - static inline enum bch_folio_sector_state folio_sector_dirty(enum bch_folio_sector_state state) { diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c index 39f711d5069e..7b20e1267fa8 100644 --- a/fs/bcachefs/reflink.c +++ b/fs/bcachefs/reflink.c @@ -89,14 +89,6 @@ void bch2_reflink_v_to_text(struct printbuf *out, struct bch_fs *c, bch2_bkey_ptrs_to_text(out, c, k); } -bool bch2_reflink_v_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r) -{ - struct bkey_s_reflink_v l = bkey_s_to_reflink_v(_l); - struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(_r); - - return l.v->refcount == r.v->refcount && bch2_extent_merge(c, _l, _r); -} - int bch2_trans_mark_reflink_v(struct btree_trans *trans, enum btree_id btree_id, unsigned level, struct bkey_s_c old, struct bkey_i *new, From patchwork Tue Sep 12 21:24:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 138446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp694175vqx; Tue, 12 Sep 2023 14:37:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHR8pgGphYSDj/8R/Mx7h0Yx5C8dXOdJ93RK3huOfysaRQLReiahig3L1t4TKwB7rct+q1x X-Received: by 2002:a05:6808:1446:b0:3a4:31c6:7650 with SMTP id x6-20020a056808144600b003a431c67650mr1164712oiv.26.1694554635379; Tue, 12 Sep 2023 14:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694554635; cv=none; d=google.com; s=arc-20160816; b=pz1zy7q/JUoWC6QBmJqbf4Jr/RFSKPRdCZJ6aK8LlEPyE3RJND0OAEj9yAdp10ftJq J/n/WYpnS2K0UVKAPmQT+ctuuls3tVElVZB068bCjgAGXk+8S4XkKjD8Js0Xzx2MS4MM 5muZRmiMo9b7WNR55KmTaEtGmVnvvn/fOziXu2OXEP5od6SsLqZ7dF1KeazkRoubRutv fnNqsud4ygq/1ucdWKTSkn29jLB71dJEnsk04mtRbHZxqxTfx6KAHNyhHXQ9BDE2avy6 a+PcnlXrlqDPp7OZSEoPXK/ejodUuTKkMwbZueg/qMaoSTDcaqsESVP/kRK6Ulv4OcC5 ZI0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=EUqIyYQCNqYTPGY2CcW0DUD5gZP3dzQicgJCw3Muze4=; fh=4hWYXOZPVnsazVJtA2U9efwFkVrBftMezeKsFlHg7DA=; b=ORkTg4mk55lhKjQ32VOgJC2mF2E1+2RfQ0Zl5BhvwMQ/hRNX148gmSffd+Hb6oqB04 3RfB5MGTu2CgURb25pzkQvtsMy/jiuiWZ8jnLA0dco2FqKoVkOKaa1J/lHoJjl7CacgP VKXzog/SXLTK9Aml9xX2rCe3ZVC5hSvV9fdQT46His50lJ2l+qcOJw8NFOPqaf7msZIr XMkg9mycpPR90e28DU/UwQV6EmH6HcsE9JX2TXkYhr8K3rN+YjdXAJ0hRlEDN+GSFf8D w6CngYGR8EFzSdnXJo0gCSBPYeL9O5Tl0rZjH5lEYJKeMOfdF6viEAPF67yPwMJQSnbU 1SHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=ghUe4u4V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id h12-20020a63f90c000000b0054fe4cdd1a7si8290117pgi.716.2023.09.12.14.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 14:37:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=ghUe4u4V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 132C2823B3FD; Tue, 12 Sep 2023 14:25:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236487AbjILVZL (ORCPT + 36 others); Tue, 12 Sep 2023 17:25:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232007AbjILVZF (ORCPT ); Tue, 12 Sep 2023 17:25:05 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15BB910CA; Tue, 12 Sep 2023 14:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694553899; bh=lcaIV/ECVCgvfmpOvOHhH9PShQ1WRH/cLwz2eArAXE4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ghUe4u4VKEZLM18H9S+zUlfgL1vzoQarlSYzrB9AQzGeco00227DWylXO3Mcpu3Aj dsUHblvTVW3hTHbJH/XMGQmqmMtfpXtEOEk3WFqGt4lxtH1OLUQRCHL1KOhLDER4ay 99xs8+bA1oUvYKhvoKzFRnfQW1svtLQPc/D3e6Ak= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 12 Sep 2023 23:24:41 +0200 Subject: [PATCH 2/5] bcachefs: Mark bch2_snapshot_node_delete() static MIME-Version: 1.0 Message-Id: <20230912-bcachefs-cleanup-v1-2-c1f717424e6a@weissschuh.net> References: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> In-Reply-To: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> To: Kent Overstreet , Brian Foster Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694553898; l=755; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=lcaIV/ECVCgvfmpOvOHhH9PShQ1WRH/cLwz2eArAXE4=; b=C1az70RMin9nhh865O+G2H+Zias+zDorazwXfRauKsf9FyYfBQCBoCIXKL8BRCrr6512kw+Oi l5ONOXBg3RiBInEyVDrIO2thY1tamVeFhYZCegF3O1AP0I6o+dcfdnx X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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 (pete.vger.email [0.0.0.0]); Tue, 12 Sep 2023 14:25:38 -0700 (PDT) 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776869321474327105 X-GMAIL-MSGID: 1776869321474327105 It is never used outside of snapshot.c. Signed-off-by: Thomas Weißschuh --- fs/bcachefs/snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c index 9da09911466e..c69b16010027 100644 --- a/fs/bcachefs/snapshot.c +++ b/fs/bcachefs/snapshot.c @@ -930,7 +930,7 @@ static inline void normalize_snapshot_child_pointers(struct bch_snapshot *s) swap(s->children[0], s->children[1]); } -int bch2_snapshot_node_delete(struct btree_trans *trans, u32 id) +static int bch2_snapshot_node_delete(struct btree_trans *trans, u32 id) { struct bch_fs *c = trans->c; struct btree_iter iter, p_iter = (struct btree_iter) { NULL }; From patchwork Tue Sep 12 21:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 138487 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp745414vqx; Tue, 12 Sep 2023 16:38:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHG9cq89FtkMdWJfdB2jI6xvJaRNhVB9PVb01ExU5wSW1T1o/nNcvCMZjn8772rlLhRZFw3 X-Received: by 2002:a17:90b:4a88:b0:262:f449:4497 with SMTP id lp8-20020a17090b4a8800b00262f4494497mr758331pjb.2.1694561891674; Tue, 12 Sep 2023 16:38:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694561891; cv=none; d=google.com; s=arc-20160816; b=EBurwvE3jV0YZKi6ayTBNyVOy6V/DIX4qj0hM7JCECQlMChKTxMmMvVJAEhKAOJ7Ni LrikS9XfPQAON9iRwsrkBh+y9XDEzBpmqs66T+KjIZfzj5A9c8ouhngJkNqjBNjRM6RG V9laeySVLT0yci1i5rGtMp/7KgZ/X9YDt8/jlWKuYA3pm5A7aYEXa2QeQE1JXuPEJkYV uWrOukNXCB9pBLWkzLKnD8R4Uw/zfCh8Ru+RYtPfXLsQNuyKTCTTRiER8QjWuQsZKrdN C1f05kpOMChLijVm0zxeH69ZpfIbAu6/qXAlYHbAHu007U3ZhBLV9JycyHPCOycuNOva HYYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=RFM4P4SKKA4rZxV0juRlFXuhkWboic1q1rkQPb0A9bU=; fh=4hWYXOZPVnsazVJtA2U9efwFkVrBftMezeKsFlHg7DA=; b=NusG3beaQUekJo6QJFaH1R7/bGI28KuW83UjwGZ8n/7+k/sLGhM6Z/zCzVArynsGZQ LPTq7RrSlaqsq3P5XXBQNnMiPbYW7CJL7zIjB1tJ0ImewueAa4TGvZVZLcxyhdPL0NEq ltvKfx1TrkRH7nGsHcIUbHrqYsXiuz0Ateu3Ykjycvy66jpwYwX4iD63jeFRpJww8H7r toHqgeEgaEJQDoLCkh/rLS4A1anY3RbOB/Q8yq/wgHzROm1hMtI+bQcFHcNMeDrVAptV ooJmcF+4z2kJ7g8XDWY3u3+HfTKTvCALyj2kcFEg3LpFcKXyBo+/1HzD7Xqk6ML47v8E eJ0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=YPsHr9Qw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id ot1-20020a17090b3b4100b002741e78e66asi332335pjb.153.2023.09.12.16.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 16:38:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=YPsHr9Qw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 50291820968F; Tue, 12 Sep 2023 14:25:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232442AbjILVZN (ORCPT + 36 others); Tue, 12 Sep 2023 17:25:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232356AbjILVZG (ORCPT ); Tue, 12 Sep 2023 17:25:06 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15C3410CC; Tue, 12 Sep 2023 14:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694553899; bh=/kse3qKov8RaUQQ0dAV0eIE8jxAbgGkkA/VnQUeR3Hc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YPsHr9Qw4/eBThgV4IkuBIwtLsZbxUFHMYXOogkW4kvBlYhidVlPnDeS/8VnmSRjt 2toiwSl/Z9+7vXh/Xlsen9bHFX1RirrWSkKbXRaN7LWl0vccDoVxLrb1wUaXY8xzym Eq620Ztg/cYP6ZW9/EwhQ7Gj4XWuy5ZZhkxoAp7o= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 12 Sep 2023 23:24:42 +0200 Subject: [PATCH 3/5] bcachefs: Delete set but not used variables MIME-Version: 1.0 Message-Id: <20230912-bcachefs-cleanup-v1-3-c1f717424e6a@weissschuh.net> References: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> In-Reply-To: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> To: Kent Overstreet , Brian Foster Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694553898; l=4953; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=/kse3qKov8RaUQQ0dAV0eIE8jxAbgGkkA/VnQUeR3Hc=; b=Bpqe2tcv8t9Ver8916JkL9fOO3wbJpy1YoLo6UiWo4Z3/s2FXfrch5keooOAwlWNqH4OMthwM 2qRV05NhXpaAoIeCMEXVZ3qZ7PXGqWPgVTK80xjV68LZImNtcRxBi56 X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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 (lipwig.vger.email [0.0.0.0]); Tue, 12 Sep 2023 14:25:35 -0700 (PDT) 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776876929850561373 X-GMAIL-MSGID: 1776876929850561373 As the variables are never read back they can be removed. Signed-off-by: Thomas Weißschuh --- fs/bcachefs/alloc_foreground.c | 3 --- fs/bcachefs/backpointers.c | 3 --- fs/bcachefs/btree_io.c | 3 +-- fs/bcachefs/btree_trans_commit.c | 4 ---- fs/bcachefs/compress.c | 4 ---- fs/bcachefs/data_update.c | 4 ---- 6 files changed, 1 insertion(+), 20 deletions(-) diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c index e02749ddc362..c1c0f92da52e 100644 --- a/fs/bcachefs/alloc_foreground.c +++ b/fs/bcachefs/alloc_foreground.c @@ -775,7 +775,6 @@ static int bucket_alloc_from_stripe(struct btree_trans *trans, struct dev_alloc_list devs_sorted; struct ec_stripe_head *h; struct open_bucket *ob; - struct bch_dev *ca; unsigned i, ec_idx; int ret = 0; @@ -805,8 +804,6 @@ static int bucket_alloc_from_stripe(struct btree_trans *trans, } goto out_put_head; got_bucket: - ca = bch_dev_bkey_exists(c, ob->dev); - ob->ec_idx = ec_idx; ob->ec = h->s; ec_stripe_new_get(h->s, STRIPE_REF_io); diff --git a/fs/bcachefs/backpointers.c b/fs/bcachefs/backpointers.c index 8747c5e19f99..a0457b75feb5 100644 --- a/fs/bcachefs/backpointers.c +++ b/fs/bcachefs/backpointers.c @@ -351,7 +351,6 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_ { struct bch_fs *c = trans->c; struct btree_iter alloc_iter = { NULL }; - struct bch_dev *ca; struct bkey_s_c alloc_k; struct printbuf buf = PRINTBUF; int ret = 0; @@ -363,8 +362,6 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_ goto out; } - ca = bch_dev_bkey_exists(c, k.k->p.inode); - alloc_k = bch2_bkey_get_iter(trans, &alloc_iter, BTREE_ID_alloc, bp_pos_to_bucket(c, k.k->p), 0); ret = bkey_err(alloc_k); diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index 0edbb73a5ec8..8655a07456e6 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -908,7 +908,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca, bool updated_range = b->key.k.type == KEY_TYPE_btree_ptr_v2 && BTREE_PTR_RANGE_UPDATED(&bkey_i_to_btree_ptr_v2(&b->key)->v); unsigned u64s; - unsigned blacklisted_written, nonblacklisted_written = 0; + unsigned nonblacklisted_written = 0; unsigned ptr_written = btree_ptr_sectors_written(&b->key); struct printbuf buf = PRINTBUF; int ret = 0, retry_read = 0, write = READ; @@ -1071,7 +1071,6 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca, * important that we start writing new bsets after the most recent _non_ * blacklisted bset: */ - blacklisted_written = b->written; b->written = nonblacklisted_written; } diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c index eafb0388ef82..b19a9400d477 100644 --- a/fs/bcachefs/btree_trans_commit.c +++ b/fs/bcachefs/btree_trans_commit.c @@ -555,7 +555,6 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags, struct btree_write_buffered_key *wb; struct btree_trans_commit_hook *h; unsigned u64s = 0; - bool marking = false; int ret; if (race_fault()) { @@ -584,9 +583,6 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags, *stopped_at = i; return ret; } - - if (btree_node_type_needs_gc(i->bkey_type)) - marking = true; } if (trans->nr_wb_updates && diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c index 6b17f7cc5860..4342995b0900 100644 --- a/fs/bcachefs/compress.c +++ b/fs/bcachefs/compress.c @@ -571,7 +571,6 @@ void bch2_fs_compress_exit(struct bch_fs *c) static int __bch2_fs_compress_init(struct bch_fs *c, u64 features) { size_t decompress_workspace_size = 0; - bool decompress_workspace_needed; ZSTD_parameters params = zstd_get_params(zstd_max_clevel(), c->opts.encoded_extent_max); struct { @@ -620,9 +619,6 @@ static int __bch2_fs_compress_init(struct bch_fs *c, u64 features) if (!(features & (1 << i->feature))) continue; - if (i->decompress_workspace) - decompress_workspace_needed = true; - if (mempool_initialized(&c->compress_workspace[i->type])) continue; diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c index 81518f20d37d..09c757fdc448 100644 --- a/fs/bcachefs/data_update.c +++ b/fs/bcachefs/data_update.c @@ -49,10 +49,6 @@ static void trace_move_extent_fail2(struct data_update *m, if (insert) { i = 0; bkey_for_each_ptr_decode(old.k, bch2_bkey_ptrs_c(old), p, entry) { - struct bkey_s new_s; - new_s.k = (void *) new.k; - new_s.v = (void *) new.v; - if (((1U << i) & m->data_opts.rewrite_ptrs) && (ptr = bch2_extent_has_ptr(old, p, bkey_i_to_s(insert))) && !ptr->cached) From patchwork Tue Sep 12 21:24:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 138867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1132782vqx; Wed, 13 Sep 2023 07:39:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/fhDx7Lf7fientZxCMTJO5+8SsdQTn1OuGcRTj1iQrquDxTUfuuc/2EKvBXhPZnCErsS8 X-Received: by 2002:a17:903:41cd:b0:1c3:9764:764f with SMTP id u13-20020a17090341cd00b001c39764764fmr3246927ple.48.1694615954827; Wed, 13 Sep 2023 07:39:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615954; cv=none; d=google.com; s=arc-20160816; b=ah37WObFUh2AylUji7NH5rC85T4xcdASwtQ+dUASleiQgjyft1OhH9kvMUwU4rvAbT NH/GKRni674AVZldRiJ6ATiWdWTjIAcMyTDH9zB2zjlHi6U/sqWwCoZtCLNI/9/I1zvM BqkGINz56CgsTskrCuBjWEz6pjX2VsWS2cEsth/VNhToY0Ol4eynkWLUtNLo5a2bp0HK 3p7yx1LSmsrTH8VZE67jipwgU/jiYvuUQZX2dV5RcIOFK9Fshg6+TPy20gKR+ld7q7cM 90PWWD5OUegs7nXqPUMF7NMZ+V1UnsHHv9XgazP1nSnRTMIkI6i7KYtqxP2Z3K3h8o6o xsuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=4nr4M9eWXuJbF3CGSnOxqmcLPW+v0w05dIGAm42XF2A=; fh=4hWYXOZPVnsazVJtA2U9efwFkVrBftMezeKsFlHg7DA=; b=jL2Fyv1mCEA0Ow0cO4qPx9mSu5e22qhObiVSLof7+RZ7PIwaG7a0Xj3cuOrVsJNWEW MTthaAI48v/4fOT1g1lRBbL5AdB3MaNKceOaP0gssvU9KHXnzNNDDCItD2lCR/Ryj9ip Q/DfxBSvdBoLksAfVF8w4u3mm3gW0rzHYy0p6F2qXOATHaHIg5Gj6zJPMA3nEUTwdEo1 Mr09PSG/7xk/n13ha5Bf0P1BuIuo7TXgKiYbYc5ngf/j1uN3OhBFc+DhK99hg4ub4+wp ooJd65yNwvaT2LrJERN5Kw3VtBnnWZtkbtrhof8u+wpWET0PaGVDPdTaA8EebDj7YvyH yKDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=iThkq4cZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cp6-20020a170902e78600b001b89ce303e4si10323783plb.195.2023.09.13.07.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:39:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=iThkq4cZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 36FB380293A1; Tue, 12 Sep 2023 14:25:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232550AbjILVZG (ORCPT + 36 others); Tue, 12 Sep 2023 17:25:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231528AbjILVZF (ORCPT ); Tue, 12 Sep 2023 17:25:05 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6290B10CC; Tue, 12 Sep 2023 14:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694553899; bh=troU+PLlpwci323/gDB4WCiWvfP0ri6UwPZrciYRTEw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iThkq4cZawFuSxlPgoouuVennh3f97hIHInNKMBu6XYDe3UlW1FikkCUe78qF2ZYC cdyWAOnmijSQx7DBPSP2s/jiY4J9LwpVJDPsCoeNIj90b/d0aeA6D91LBu+vYqJP+b uqRWIlsIeSTdakfpghyVSwduCagA9WphDjW/Hc+U= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 12 Sep 2023 23:24:43 +0200 Subject: [PATCH 4/5] bcachefs: Add printf function attributes MIME-Version: 1.0 Message-Id: <20230912-bcachefs-cleanup-v1-4-c1f717424e6a@weissschuh.net> References: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> In-Reply-To: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> To: Kent Overstreet , Brian Foster Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694553898; l=2069; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=troU+PLlpwci323/gDB4WCiWvfP0ri6UwPZrciYRTEw=; b=UK0IJW37miCSEW8yO3EoCxvTRteZPjU10AFlPnPVJvMYtlcq72U7XIE/0JVsNjtbVPc3H+vEW XgvSvjFN426BbdhG0LXoxQDwbwc6c5+m6R8OoVWKAL+8bWKY/JFtPXK X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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]); Tue, 12 Sep 2023 14:25:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776933619533751555 X-GMAIL-MSGID: 1776933619533751555 These help the compiler detect incorrect use of format strings and their arguments. Signed-off-by: Thomas Weißschuh --- fs/bcachefs/btree_io.c | 1 + fs/bcachefs/btree_update.c | 2 ++ fs/bcachefs/btree_update.h | 3 +++ 3 files changed, 6 insertions(+) diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index 8655a07456e6..bfaaa6b612ad 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -542,6 +542,7 @@ static void btree_err_msg(struct printbuf *out, struct bch_fs *c, prt_str(out, ": "); } +__printf(8, 9) static int __btree_err(int ret, struct bch_fs *c, struct bch_dev *ca, diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c index 3dcb05b51e2d..cf0415e93feb 100644 --- a/fs/bcachefs/btree_update.c +++ b/fs/bcachefs/btree_update.c @@ -818,6 +818,7 @@ int bch2_btree_bit_mod(struct btree_trans *trans, enum btree_id btree, return bch2_trans_update_buffered(trans, btree, k); } +__printf(2, 0) static int __bch2_trans_log_msg(darray_u64 *entries, const char *fmt, va_list args) { struct printbuf buf = PRINTBUF; @@ -854,6 +855,7 @@ static int __bch2_trans_log_msg(darray_u64 *entries, const char *fmt, va_list ar return ret; } +__printf(3, 0) static int __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt, va_list args) diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h index c6ab11c76cc3..13a47aac9b81 100644 --- a/fs/bcachefs/btree_update.h +++ b/fs/bcachefs/btree_update.h @@ -2,6 +2,8 @@ #ifndef _BCACHEFS_BTREE_UPDATE_H #define _BCACHEFS_BTREE_UPDATE_H +#include + #include "btree_iter.h" #include "journal.h" #include "journal.h" @@ -114,6 +116,7 @@ void bch2_trans_commit_hook(struct btree_trans *, struct btree_trans_commit_hook *); int __bch2_trans_commit(struct btree_trans *, unsigned); +__printf(2, 3) int bch2_journal_log_msg(struct bch_fs *, const char *, ...); /** From patchwork Tue Sep 12 21:24:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 138503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp767867vqx; Tue, 12 Sep 2023 17:34:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IES4ZFn5nVXz3a8Q0iAOV6xTJhGS6WIPE8w95e3zB0CFZqqpbWH8nW48OrF9lP4Pag0RnOG X-Received: by 2002:a05:6a20:2453:b0:157:e67c:6f with SMTP id t19-20020a056a20245300b00157e67c006fmr1086338pzc.55.1694565280045; Tue, 12 Sep 2023 17:34:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694565280; cv=none; d=google.com; s=arc-20160816; b=vSz1MQPKvMuG3xMOlm7worYbLIMb8WIc7j91anW2QmV+ohnNnxzQa/+6weC/3OzYUD XmHA/FG3FTWC/jE+FZiD/sUeiSAquMwdWJAWI4hVBIKFLiluINCK3GV1KkE9EljZLuiP T28696eunZ2G3Z2A25V9FNtnNM/glGUkjSMl69pOH7j3aiPyeMeymGpuwgpNuB0e9BK6 wY3zBqTYD0SFVY/cQ9Ko3yAWjInKm85OU6/M8dN/uybcIPSng+eov6hR5D2S32pOVHII MoYpD3WGRSctENNGjFh/AbgPtvrUKKCv/JYPTfMHkwikpd30yiQcr4nnaXWWlECjh6Ix cvHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=gasT9qwYNPV8OO2pWME5A4R587d4J5xayhRyWJ9xNIs=; fh=4hWYXOZPVnsazVJtA2U9efwFkVrBftMezeKsFlHg7DA=; b=Suk3HqEpD/LFTs5WxYnGyI3Mb7GqmwlX3715jpfDZbzUFOHvZ7GmYXAqOqVayeLNid A4MATEzjmUly/zqm2JSdV9yTpbjvhTHlNNfTEijKFZYyy6TBjE3QNiQXPjndsE3IizH4 x4cUNrO3HXNhHt7x4VV9Xi3iX/lHlzMqhq7fh/TmRcd8A6XnugU5geL5KFsmmUsxMx0f M3xLG/HRut++RB6mlpy6aHZD6AyazKy0A8e3BiTlz7mzhBQZTqoXiQa/8dO95zDPGr7e lP4BRV3NCSxTXpRD7JNqL/+XGcG+UeC1Y3DrgjX9F7VqaO68hSKcWy3tMf/yW7DiUdt/ POSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=U9FnZjwV; 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 Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id l5-20020a056a00140500b0068fcb9a7349si4063029pfu.349.2023.09.12.17.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 17:34:40 -0700 (PDT) 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=@weissschuh.net header.s=mail header.b=U9FnZjwV; 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 Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 410318197E82; Tue, 12 Sep 2023 14:25:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236342AbjILVZP (ORCPT + 36 others); Tue, 12 Sep 2023 17:25:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233650AbjILVZG (ORCPT ); Tue, 12 Sep 2023 17:25:06 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED48E10CC; Tue, 12 Sep 2023 14:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694553900; bh=Wmu1+Z9yrBCAmEnc1DatlQpRMBdDXqfSMezQJyU+ih8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=U9FnZjwVVDq/gFpBj0poKZjyMq+xOqtkKuIxgzMiEEITTDD8kyEy05bjzsadaCi1H R+44xIV44q9At6udAO7CH/Q8pHUUGYHvoLhKACav6DnF5qmMQ9bZwHe7u9ShppoiJm IMpcP97IjxyBzpKw8tGYV8i32TBv9oPqahg95RQg= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 12 Sep 2023 23:24:44 +0200 Subject: [PATCH 5/5] bcachefs: Avoid unused symbol warnings from headers MIME-Version: 1.0 Message-Id: <20230912-bcachefs-cleanup-v1-5-c1f717424e6a@weissschuh.net> References: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> In-Reply-To: <20230912-bcachefs-cleanup-v1-0-c1f717424e6a@weissschuh.net> To: Kent Overstreet , Brian Foster Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694553898; l=7973; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=Wmu1+Z9yrBCAmEnc1DatlQpRMBdDXqfSMezQJyU+ih8=; b=6uesjb03g638/ql3k0Md5pUt3lb4dz/4y+OxV5wT8bheOXgdQ4HJVsSg9D4cGnQub5Q+RKDQd 5EgP5mC6dl5BRUAf9YBZ8jB5Xb2G8XLxegiTSIVqflhMwBwnSiRJlCE X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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]); Tue, 12 Sep 2023 14:25:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776880483296345388 X-GMAIL-MSGID: 1776880483296345388 Static variables defined in headers generate unused variable compiler warnings in CUs that do not use said functions. Avoid the warnings by either replacing the variables by enums and by explicitly inhibiting the warning. Signed-off-by: Thomas Weißschuh --- fs/bcachefs/bcachefs.h | 3 ++- fs/bcachefs/bcachefs_format.h | 15 ++++++----- fs/bcachefs/btree_types.h | 63 ++++++++++++++++++++++--------------------- fs/bcachefs/fs-ioctl.h | 8 +++--- fs/bcachefs/opts.h | 3 ++- 5 files changed, 50 insertions(+), 42 deletions(-) diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h index 30b3d7b9f9dc..b5a8ea44f9ef 100644 --- a/fs/bcachefs/bcachefs.h +++ b/fs/bcachefs/bcachefs.h @@ -186,6 +186,7 @@ #include #include #include +#include #include #include #include @@ -371,7 +372,7 @@ BCH_DEBUG_PARAMS() #undef BCH_DEBUG_PARAM #ifndef CONFIG_BCACHEFS_DEBUG -#define BCH_DEBUG_PARAM(name, description) static const bool bch2_##name; +#define BCH_DEBUG_PARAM(name, description) static const __used bool bch2_##name; BCH_DEBUG_PARAMS_DEBUG() #undef BCH_DEBUG_PARAM #endif diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index 1cce2504bca6..a13455dbb32c 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -74,6 +74,7 @@ #include #include +#include #include #include #include "vstructs.h" @@ -83,8 +84,8 @@ typedef uuid_t __uuid_t; #endif #define BITMASK(name, type, field, offset, end) \ -static const unsigned name##_OFFSET = offset; \ -static const unsigned name##_BITS = (end - offset); \ +static const __used unsigned name##_OFFSET = offset; \ +static const __used unsigned name##_BITS = (end - offset); \ \ static inline __u64 name(const type *k) \ { \ @@ -98,9 +99,9 @@ static inline void SET_##name(type *k, __u64 v) \ } #define LE_BITMASK(_bits, name, type, field, offset, end) \ -static const unsigned name##_OFFSET = offset; \ -static const unsigned name##_BITS = (end - offset); \ -static const __u##_bits name##_MAX = (1ULL << (end - offset)) - 1; \ +static const __used unsigned name##_OFFSET = offset; \ +static const __used unsigned name##_BITS = (end - offset); \ +static const __used __u##_bits name##_MAX = (1ULL << (end - offset)) - 1; \ \ static inline __u64 name(const type *k) \ { \ @@ -1639,7 +1640,7 @@ enum bcachefs_metadata_version { bcachefs_metadata_version_max }; -static const unsigned bcachefs_metadata_required_upgrade_below = bcachefs_metadata_version_major_minor; +static const __used unsigned bcachefs_metadata_required_upgrade_below = bcachefs_metadata_version_major_minor; #define bcachefs_metadata_version_current (bcachefs_metadata_version_max - 1) @@ -1946,7 +1947,7 @@ enum bch_csum_type { BCH_CSUM_NR }; -static const unsigned bch_crc_bytes[] = { +static const __used unsigned bch_crc_bytes[] = { [BCH_CSUM_none] = 0, [BCH_CSUM_crc32c_nonzero] = 4, [BCH_CSUM_crc32c] = 4, diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h index 70398aaa095e..a9ab52e8f9d9 100644 --- a/fs/bcachefs/btree_types.h +++ b/fs/bcachefs/btree_types.h @@ -181,36 +181,39 @@ struct btree_node_iter { } data[MAX_BSETS]; }; -/* - * Iterate over all possible positions, synthesizing deleted keys for holes: - */ -static const u16 BTREE_ITER_SLOTS = 1 << 0; -static const u16 BTREE_ITER_ALL_LEVELS = 1 << 1; -/* - * Indicates that intent locks should be taken on leaf nodes, because we expect - * to be doing updates: - */ -static const u16 BTREE_ITER_INTENT = 1 << 2; -/* - * Causes the btree iterator code to prefetch additional btree nodes from disk: - */ -static const u16 BTREE_ITER_PREFETCH = 1 << 3; -/* - * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for - * @pos or the first key strictly greater than @pos - */ -static const u16 BTREE_ITER_IS_EXTENTS = 1 << 4; -static const u16 BTREE_ITER_NOT_EXTENTS = 1 << 5; -static const u16 BTREE_ITER_CACHED = 1 << 6; -static const u16 BTREE_ITER_WITH_KEY_CACHE = 1 << 7; -static const u16 BTREE_ITER_WITH_UPDATES = 1 << 8; -static const u16 BTREE_ITER_WITH_JOURNAL = 1 << 9; -static const u16 __BTREE_ITER_ALL_SNAPSHOTS = 1 << 10; -static const u16 BTREE_ITER_ALL_SNAPSHOTS = 1 << 11; -static const u16 BTREE_ITER_FILTER_SNAPSHOTS = 1 << 12; -static const u16 BTREE_ITER_NOPRESERVE = 1 << 13; -static const u16 BTREE_ITER_CACHED_NOFILL = 1 << 14; -static const u16 BTREE_ITER_KEY_CACHE_FILL = 1 << 15; +enum { + /* + * Iterate over all possible positions, synthesizing deleted keys for holes: + */ + BTREE_ITER_SLOTS = 1 << 0, + BTREE_ITER_ALL_LEVELS = 1 << 1, + /* + * Indicates that intent locks should be taken on leaf nodes, because we expect + * to be doing updates: + */ + BTREE_ITER_INTENT = 1 << 2, + /* + * Causes the btree iterator code to prefetch additional btree nodes from disk: + */ + BTREE_ITER_PREFETCH = 1 << 3, + + /* + * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for + * @pos or the first key strictly greater than @pos + */ + BTREE_ITER_IS_EXTENTS = 1 << 4, + BTREE_ITER_NOT_EXTENTS = 1 << 5, + BTREE_ITER_CACHED = 1 << 6, + BTREE_ITER_WITH_KEY_CACHE = 1 << 7, + BTREE_ITER_WITH_UPDATES = 1 << 8, + BTREE_ITER_WITH_JOURNAL = 1 << 9, + __BTREE_ITER_ALL_SNAPSHOTS = 1 << 10, + BTREE_ITER_ALL_SNAPSHOTS = 1 << 11, + BTREE_ITER_FILTER_SNAPSHOTS = 1 << 12, + BTREE_ITER_NOPRESERVE = 1 << 13, + BTREE_ITER_CACHED_NOFILL = 1 << 14, + BTREE_ITER_KEY_CACHE_FILL = 1 << 15, +}; #define __BTREE_ITER_FLAGS_END 16 enum btree_path_uptodate { diff --git a/fs/bcachefs/fs-ioctl.h b/fs/bcachefs/fs-ioctl.h index f201980ef2c3..0ebf4106ed2f 100644 --- a/fs/bcachefs/fs-ioctl.h +++ b/fs/bcachefs/fs-ioctl.h @@ -2,10 +2,12 @@ #ifndef _BCACHEFS_FS_IOCTL_H #define _BCACHEFS_FS_IOCTL_H +#include + /* Inode flags: */ /* bcachefs inode flags -> vfs inode flags: */ -static const unsigned bch_flags_to_vfs[] = { +static const __used unsigned bch_flags_to_vfs[] = { [__BCH_INODE_SYNC] = S_SYNC, [__BCH_INODE_IMMUTABLE] = S_IMMUTABLE, [__BCH_INODE_APPEND] = S_APPEND, @@ -13,7 +15,7 @@ static const unsigned bch_flags_to_vfs[] = { }; /* bcachefs inode flags -> FS_IOC_GETFLAGS: */ -static const unsigned bch_flags_to_uflags[] = { +static const __used unsigned bch_flags_to_uflags[] = { [__BCH_INODE_SYNC] = FS_SYNC_FL, [__BCH_INODE_IMMUTABLE] = FS_IMMUTABLE_FL, [__BCH_INODE_APPEND] = FS_APPEND_FL, @@ -22,7 +24,7 @@ static const unsigned bch_flags_to_uflags[] = { }; /* bcachefs inode flags -> FS_IOC_FSGETXATTR: */ -static const unsigned bch_flags_to_xflags[] = { +static const __used unsigned bch_flags_to_xflags[] = { [__BCH_INODE_SYNC] = FS_XFLAG_SYNC, [__BCH_INODE_IMMUTABLE] = FS_XFLAG_IMMUTABLE, [__BCH_INODE_APPEND] = FS_XFLAG_APPEND, diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h index 8a9db110d64f..35831159e207 100644 --- a/fs/bcachefs/opts.h +++ b/fs/bcachefs/opts.h @@ -3,6 +3,7 @@ #define _BCACHEFS_OPTS_H #include +#include #include #include #include @@ -469,7 +470,7 @@ struct bch_opts { #undef x }; -static const struct bch_opts bch2_opts_default = { +static const __used struct bch_opts bch2_opts_default = { #define x(_name, _bits, _mode, _type, _sb_opt, _default, ...) \ ._name##_defined = true, \ ._name = _default, \