bcachefs: Kill dev_usage->buckets_ec

This counter is redundant; it's simply the sum of BCH_DATA_stripe and
BCH_DATA_parity buckets.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index d2eb1bd0c8ee736d6cf0473fe1ca981e86f7bc9f..41fa8b9b69f43c2ea9331c9b350d445f00021d73 100644 (file)
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -2231,8 +2231,8 @@ struct jset_entry_dev_usage {
        __le32                  dev;
        __u32                   pad;
 
-       __le64                  buckets_ec;
-       __le64                  _buckets_unavailable; /* No longer used */
+       __le64                  _buckets_ec;            /* No longer used */
+       __le64                  _buckets_unavailable;   /* No longer used */
 
        struct jset_entry_dev_usage_type d[];
 };

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 2304a6ab0d0ce62b2da91d6faec406df2447e0f0..0db18d0d47e82ec4dd79ac861ab9247e70e78e31 100644 (file)
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -1251,9 +1251,6 @@ static int bch2_gc_done(struct bch_fs *c,
                        copy_dev_field(dev_usage_fragmented_wrong,
                                       d[i].fragmented, "%s fragmented", bch2_data_types[i]);
                }
-
-               copy_dev_field(dev_usage_buckets_ec_wrong,
-                              buckets_ec,              "buckets_ec");
        }
 
        {

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 36ed3c53e81c00b9bf321eb728af2754709dbc1d..4a8c4f0f2bb31bc92782437cde4c2ff2bc5e0988 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -299,12 +299,6 @@ void bch2_dev_usage_to_text(struct printbuf *out, struct bch_dev_usage *usage)
                prt_tab_rjust(out);
                prt_newline(out);
        }
-
-       prt_str(out, "ec");
-       prt_tab(out);
-       prt_u64(out, usage->buckets_ec);
-       prt_tab_rjust(out);
-       prt_newline(out);
 }
 
 static void bch2_dev_usage_update(struct bch_fs *c, struct bch_dev *ca,
@@ -328,9 +322,6 @@ static void bch2_dev_usage_update(struct bch_fs *c, struct bch_dev *ca,
        u->d[old.data_type].buckets--;
        u->d[new.data_type].buckets++;
 
-       u->buckets_ec -= !!old.stripe;
-       u->buckets_ec += !!new.stripe;
-
        u->d[old.data_type].sectors -= bch2_bucket_sectors_dirty(old);
        u->d[new.data_type].sectors += bch2_bucket_sectors_dirty(new);
 

diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index 2a9dab9006efa68ca64648d866fec47010b58ad2..783f71017204cafa0277644a6d1b5564c779d366 100644 (file)
--- a/fs/bcachefs/buckets_types.h
+++ b/fs/bcachefs/buckets_types.h
@@ -33,8 +33,6 @@ struct bucket_gens {
 };
 
 struct bch_dev_usage {
-       u64                     buckets_ec;
-
        struct {
                u64             buckets;
                u64             sectors; /* _compressed_ sectors: */

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index c46b3bf09fd545182cf45bc625278716f20c99e9..f2e038116b0fdb07a6eced6c489e0002354d4a0d 100644 (file)
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -687,8 +687,6 @@ static void journal_entry_dev_usage_to_text(struct printbuf *out, struct bch_fs
                       le64_to_cpu(u->d[i].sectors),
                       le64_to_cpu(u->d[i].fragmented));
        }
-
-       prt_printf(out, " buckets_ec: %llu", le64_to_cpu(u->buckets_ec));
 }
 
 static int journal_entry_log_validate(struct bch_fs *c,

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index a588092241ca7d53d2ec9002371c02572efcef7c..d49c0af4262391a709719c4f1edc3cca014f14d3 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -305,8 +305,6 @@ static int journal_replay_entry_early(struct bch_fs *c,
                struct bch_dev *ca = bch_dev_bkey_exists(c, le32_to_cpu(u->dev));
                unsigned i, nr_types = jset_entry_dev_usage_nr_types(u);
 
-               ca->usage_base->buckets_ec              = le64_to_cpu(u->buckets_ec);
-
                for (i = 0; i < min_t(unsigned, nr_types, BCH_DATA_NR); i++) {
                        ca->usage_base->d[i].buckets    = le64_to_cpu(u->d[i].buckets);
                        ca->usage_base->d[i].sectors    = le64_to_cpu(u->d[i].sectors);

diff --git a/fs/bcachefs/sb-clean.c b/fs/bcachefs/sb-clean.c
index bc1d9808808d9a5db4dd790ea9d7d936ed733ca4..c100f2ec2b9623e8b14af61c0869ce021371c093 100644 (file)
--- a/fs/bcachefs/sb-clean.c
+++ b/fs/bcachefs/sb-clean.c
@@ -256,7 +256,6 @@ void bch2_journal_super_entries_add_common(struct bch_fs *c,
 
                u->entry.type = BCH_JSET_ENTRY_dev_usage;
                u->dev = cpu_to_le32(dev);
-               u->buckets_ec           = cpu_to_le64(ca->usage_base->buckets_ec);
 
                for (i = 0; i < BCH_DATA_NR; i++) {
                        u->d[i].buckets = cpu_to_le64(ca->usage_base->d[i].buckets);