Commit 72a6bb09 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Kill bch2_fs_usage_initialize() 



Deleting code for the old disk accounting scheme.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent f5095b9f

fs/bcachefs/buckets.c

+0 −29
Original line number Diff line number Diff line
@@ -38,35 +38,6 @@ static inline struct bch_fs_usage *fs_usage_ptr(struct bch_fs *c, 
			    : c->usage[journal_seq & JOURNAL_BUF_MASK]);

}



void bch2_fs_usage_initialize(struct bch_fs *c)

{

	percpu_down_write(&c->mark_lock);

	struct bch_fs_usage *usage = c->usage_base;



	for (unsigned i = 0; i < ARRAY_SIZE(c->usage); i++)

		bch2_fs_usage_acc_to_base(c, i);



	for (unsigned i = 0; i < BCH_REPLICAS_MAX; i++)

		usage->b.reserved += usage->persistent_reserved[i];



	for (unsigned i = 0; i < c->replicas.nr; i++) {

		struct bch_replicas_entry_v1 *e =

			cpu_replicas_entry(&c->replicas, i);



		fs_usage_data_type_to_base(&usage->b, e->data_type, usage->replicas[i]);

	}



	for_each_member_device(c, ca) {

		struct bch_dev_usage dev = bch2_dev_usage_read(ca);



		usage->b.hidden += (dev.d[BCH_DATA_sb].buckets +

				  dev.d[BCH_DATA_journal].buckets) *

			ca->mi.bucket_size;

	}



	percpu_up_write(&c->mark_lock);

}



void bch2_dev_usage_read_fast(struct bch_dev *ca, struct bch_dev_usage *usage)

{

	memset(usage, 0, sizeof(*usage));

fs/bcachefs/buckets.h

+0 −2
Original line number Diff line number Diff line
@@ -318,8 +318,6 @@ void bch2_dev_usage_update(struct bch_fs *, struct bch_dev *, 
int bch2_update_replicas(struct bch_fs *, struct bkey_s_c,

			 struct bch_replicas_entry_v1 *, s64);



void bch2_fs_usage_initialize(struct bch_fs *);



int bch2_bucket_ref_update(struct btree_trans *, struct bch_dev *,

			   struct bkey_s_c, const struct bch_extent_ptr *,

			   s64, enum bch_data_type, u8, u8, u32 *);

fs/bcachefs/recovery.c

+0 −2
Original line number Diff line number Diff line
@@ -509,8 +509,6 @@ static int journal_replay_early(struct bch_fs *c, 
		}

	}



	bch2_fs_usage_initialize(c);



	return 0;

}