102 lines
3.2 KiB
Diff
102 lines
3.2 KiB
Diff
From c5022a702e50321829219339841693ad5d0db035 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Sun, 8 Dec 2024 20:55:03 -0500
|
|
Subject: [PATCH 188/233] bcachefs: kill sysfs internal/accounting
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Since we added per-inode counters there's now far too many counters to
|
|
show in one shot - if we want this in the future, it'll have to be in
|
|
debugfs.
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/disk_accounting.c | 26 --------------------------
|
|
fs/bcachefs/disk_accounting.h | 1 -
|
|
fs/bcachefs/sysfs.c | 5 -----
|
|
3 files changed, 32 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
|
|
index b18cbe80936b..22a7db63e50c 100644
|
|
--- a/fs/bcachefs/disk_accounting.c
|
|
+++ b/fs/bcachefs/disk_accounting.c
|
|
@@ -471,32 +471,6 @@ int bch2_fs_accounting_read(struct bch_fs *c, darray_char *out_buf, unsigned acc
|
|
return ret;
|
|
}
|
|
|
|
-void bch2_fs_accounting_to_text(struct printbuf *out, struct bch_fs *c)
|
|
-{
|
|
- struct bch_accounting_mem *acc = &c->accounting;
|
|
-
|
|
- percpu_down_read(&c->mark_lock);
|
|
- out->atomic++;
|
|
-
|
|
- eytzinger0_for_each(i, acc->k.nr) {
|
|
- struct disk_accounting_pos acc_k;
|
|
- bpos_to_disk_accounting_pos(&acc_k, acc->k.data[i].pos);
|
|
-
|
|
- bch2_accounting_key_to_text(out, &acc_k);
|
|
-
|
|
- u64 v[BCH_ACCOUNTING_MAX_COUNTERS];
|
|
- bch2_accounting_mem_read_counters(acc, i, v, ARRAY_SIZE(v), false);
|
|
-
|
|
- prt_str(out, ":");
|
|
- for (unsigned j = 0; j < acc->k.data[i].nr_counters; j++)
|
|
- prt_printf(out, " %llu", v[j]);
|
|
- prt_newline(out);
|
|
- }
|
|
-
|
|
- --out->atomic;
|
|
- percpu_up_read(&c->mark_lock);
|
|
-}
|
|
-
|
|
static void bch2_accounting_free_counters(struct bch_accounting_mem *acc, bool gc)
|
|
{
|
|
darray_for_each(acc->k, e) {
|
|
diff --git a/fs/bcachefs/disk_accounting.h b/fs/bcachefs/disk_accounting.h
|
|
index 0eeaca12c589..2560de10b09d 100644
|
|
--- a/fs/bcachefs/disk_accounting.h
|
|
+++ b/fs/bcachefs/disk_accounting.h
|
|
@@ -251,7 +251,6 @@ static inline void bch2_accounting_trans_commit_revert(struct btree_trans *trans
|
|
|
|
int bch2_fs_replicas_usage_read(struct bch_fs *, darray_char *);
|
|
int bch2_fs_accounting_read(struct bch_fs *, darray_char *, unsigned);
|
|
-void bch2_fs_accounting_to_text(struct printbuf *, struct bch_fs *);
|
|
|
|
int bch2_gc_accounting_start(struct bch_fs *);
|
|
int bch2_gc_accounting_done(struct bch_fs *);
|
|
diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
|
|
index 97733c766948..48bc6ad03f09 100644
|
|
--- a/fs/bcachefs/sysfs.c
|
|
+++ b/fs/bcachefs/sysfs.c
|
|
@@ -203,7 +203,6 @@ read_attribute(disk_groups);
|
|
|
|
read_attribute(has_data);
|
|
read_attribute(alloc_debug);
|
|
-read_attribute(accounting);
|
|
read_attribute(usage_base);
|
|
|
|
#define x(t, n, ...) read_attribute(t);
|
|
@@ -397,9 +396,6 @@ SHOW(bch2_fs)
|
|
if (attr == &sysfs_alloc_debug)
|
|
bch2_fs_alloc_debug_to_text(out, c);
|
|
|
|
- if (attr == &sysfs_accounting)
|
|
- bch2_fs_accounting_to_text(out, c);
|
|
-
|
|
if (attr == &sysfs_usage_base)
|
|
bch2_fs_usage_base_to_text(out, c);
|
|
|
|
@@ -595,7 +591,6 @@ struct attribute *bch2_fs_internal_files[] = {
|
|
|
|
&sysfs_disk_groups,
|
|
&sysfs_alloc_debug,
|
|
- &sysfs_accounting,
|
|
&sysfs_usage_base,
|
|
NULL
|
|
};
|
|
--
|
|
2.45.2
|
|
|