Commit 6b812f1d authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: bch2_dev_remove_alloc() -> alloc_background.c 



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

fs/bcachefs/alloc_background.c

+29 −0
Original line number Diff line number Diff line
@@ -2298,6 +2298,35 @@ int bch2_fs_freespace_init(struct bch_fs *c) 
	return 0;

}



/* device removal */



int bch2_dev_remove_alloc(struct bch_fs *c, struct bch_dev *ca)

{

	struct bpos start	= POS(ca->dev_idx, 0);

	struct bpos end		= POS(ca->dev_idx, U64_MAX);

	int ret;



	/*

	 * We clear the LRU and need_discard btrees first so that we don't race

	 * with bch2_do_invalidates() and bch2_do_discards()

	 */

	ret =   bch2_btree_delete_range(c, BTREE_ID_lru, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_need_discard, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_freespace, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_backpointers, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_alloc, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_bucket_gens, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_dev_usage_remove(c, ca->dev_idx);

	bch_err_msg(ca, ret, "removing dev alloc info");

	return ret;

}



/* Bucket IO clocks: */



int bch2_bucket_io_time_reset(struct btree_trans *trans, unsigned dev,

fs/bcachefs/alloc_background.h

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ static inline const struct bch_backpointer *alloc_v4_backpointers_c(const struct 


int bch2_dev_freespace_init(struct bch_fs *, struct bch_dev *, u64, u64);

int bch2_fs_freespace_init(struct bch_fs *);

int bch2_dev_remove_alloc(struct bch_fs *, struct bch_dev *);



void bch2_recalc_capacity(struct bch_fs *);

u64 bch2_min_rw_member_capacity(struct bch_fs *);

fs/bcachefs/super.c

+0 −27
Original line number Diff line number Diff line
@@ -1592,33 +1592,6 @@ int bch2_dev_set_state(struct bch_fs *c, struct bch_dev *ca, 


/* Device add/removal: */



static int bch2_dev_remove_alloc(struct bch_fs *c, struct bch_dev *ca)

{

	struct bpos start	= POS(ca->dev_idx, 0);

	struct bpos end		= POS(ca->dev_idx, U64_MAX);

	int ret;



	/*

	 * We clear the LRU and need_discard btrees first so that we don't race

	 * with bch2_do_invalidates() and bch2_do_discards()

	 */

	ret =   bch2_btree_delete_range(c, BTREE_ID_lru, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_need_discard, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_freespace, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_backpointers, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_alloc, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_btree_delete_range(c, BTREE_ID_bucket_gens, start, end,

					BTREE_TRIGGER_norun, NULL) ?:

		bch2_dev_usage_remove(c, ca->dev_idx);

	bch_err_msg(c, ret, "removing dev alloc info");

	return ret;

}



int bch2_dev_remove(struct bch_fs *c, struct bch_dev *ca, int flags)

{

	struct bch_member *m;