diff mbox series

[12/21] bcachefs: Kill fs_usage_online

Message ID	20240225023826.2413565-13-kent.overstreet@linux.dev
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-79941-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; From: Kent Overstreet <kent.overstreet@linux.dev> To: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kent Overstreet <kent.overstreet@linux.dev>, djwong@kernel.org, bfoster@redhat.com Subject: [PATCH 12/21] bcachefs: Kill fs_usage_online Date: Sat, 24 Feb 2024 21:38:14 -0500 Message-ID: <20240225023826.2413565-13-kent.overstreet@linux.dev> In-Reply-To: <20240225023826.2413565-1-kent.overstreet@linux.dev> References: <20240225023826.2413565-1-kent.overstreet@linux.dev> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	bcachefs disk accounting rewrite \| [00/21] bcachefs disk accounting rewrite [01/21] bcachefs: KEY_TYPE_accounting [05/21] bcachefs: dev_usage updated by new accounting [06/21] bcachefs: Kill bch2_fs_usage_initialize() [07/21] bcachefs: Convert bch2_ioctl_fs_usage() to new accounting [08/21] bcachefs: kill bch2_fs_usage_read() [09/21] bcachefs: Kill writing old accounting to journal [10/21] bcachefs: Delete journal-buf-sharded old style accounting [11/21] bcachefs: Kill bch2_fs_usage_to_text() [12/21] bcachefs: Kill fs_usage_online [13/21] bcachefs: Kill replicas_journal_res [15/21] bcachefs: Convert bch2_replicas_gc2() to new accounting [16/21] bcachefs: bch2_verify_accounting_clean() [17/21] bcachefs: Eytzinger accumulation for accounting keys [18/21] bcachefs: bch_acct_compression [19/21] bcachefs: Convert bch2_compression_stats_to_text() to new accounting [20/21] bcachefs: bch2_fs_accounting_to_text() [21/21] bcachefs: bch2_fs_usage_base_to_text()

Commit Message

Kent Overstreet Feb. 25, 2024, 2:38 a.m. UTC

  More dead code deletion.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---
 fs/bcachefs/buckets.c       | 10 ----------
 fs/bcachefs/buckets.h       | 12 ------------
 fs/bcachefs/buckets_types.h |  5 -----
 3 files changed, 27 deletions(-)

diff mbox series

Patch

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index c261fa3a0273..5e2b9aa93241 100644
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -37,16 +37,6 @@  static u64 reserve_factor(u64 r)
 	return r + (round_up(r, (1 << RESERVE_FACTOR)) >> RESERVE_FACTOR);
 }
 
-u64 bch2_fs_sectors_used(struct bch_fs *c, struct bch_fs_usage_online *fs_usage)
-{
-	return min(fs_usage->u.b.hidden +
-		   fs_usage->u.b.btree +
-		   fs_usage->u.b.data +
-		   reserve_factor(fs_usage->u.b.reserved +
-				  fs_usage->online_reserved),
-		   c->capacity);
-}
-
 static struct bch_fs_usage_short
 __bch2_fs_usage_read_short(struct bch_fs *c)
 {
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index ccf9813c65e7..f9d8d7b9fbd1 100644
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -279,23 +279,11 @@  static inline unsigned fs_usage_u64s(struct bch_fs *c)
 	return __fs_usage_u64s(READ_ONCE(c->replicas.nr));
 }
 
-static inline unsigned __fs_usage_online_u64s(unsigned nr_replicas)
-{
-	return sizeof(struct bch_fs_usage_online) / sizeof(u64) + nr_replicas;
-}
-
-static inline unsigned fs_usage_online_u64s(struct bch_fs *c)
-{
-	return __fs_usage_online_u64s(READ_ONCE(c->replicas.nr));
-}
-
 static inline unsigned dev_usage_u64s(void)
 {
 	return sizeof(struct bch_dev_usage) / sizeof(u64);
 }
 
-u64 bch2_fs_sectors_used(struct bch_fs *, struct bch_fs_usage_online *);
-
 struct bch_fs_usage_short
 bch2_fs_usage_read_short(struct bch_fs *);
 
diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index baa7e0924390..570acdf455bb 100644
--- a/fs/bcachefs/buckets_types.h
+++ b/fs/bcachefs/buckets_types.h
@@ -61,11 +61,6 @@  struct bch_fs_usage {
 	u64			replicas[];
 };
 
-struct bch_fs_usage_online {
-	u64			online_reserved;
-	struct bch_fs_usage	u;
-};
-
 struct bch_fs_usage_short {
 	u64			capacity;
 	u64			used;