Commit c2250847 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: copygc_enabled, rebalance_enabled now opts.h options 



They can now be set at mount time

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

fs/bcachefs/bcachefs.h

+0 −2
Original line number Diff line number Diff line
@@ -1096,8 +1096,6 @@ struct bch_fs { 
	u64			counters_on_mount[BCH_COUNTER_NR];

	u64 __percpu		*counters;



	unsigned		copy_gc_enabled:1;



	struct bch2_time_stats	times[BCH_TIME_STAT_NR];



	struct btree_transaction_stats btree_transaction_stats[BCH_TRANSACTIONS_NR];

fs/bcachefs/movinggc.c

+2 −2
Original line number Diff line number Diff line
@@ -350,9 +350,9 @@ static int bch2_copygc_thread(void *arg) 
		bch2_trans_unlock_long(ctxt.trans);

		cond_resched();



		if (!c->copy_gc_enabled) {

		if (!c->opts.copygc_enabled) {

			move_buckets_wait(&ctxt, buckets, true);

			kthread_wait_freezable(c->copy_gc_enabled ||

			kthread_wait_freezable(c->opts.copygc_enabled ||

					       kthread_should_stop());

		}

fs/bcachefs/opts.h

+12 −0
Original line number Diff line number Diff line
@@ -473,6 +473,18 @@ enum fsck_err_opts { 
	  BCH2_NO_SB_OPT,			true,			\

	  NULL,		"Enable nocow mode: enables runtime locking in\n"\

			"data move path needed if nocow will ever be in use\n")\

	x(copygc_enabled,		u8,				\

	  OPT_FS|OPT_MOUNT,						\

	  OPT_BOOL(),							\

	  BCH2_NO_SB_OPT,			true,			\

	  NULL,		"Enable copygc: disable for debugging, or to\n"\

			"quiet the system when doing performance testing\n")\

	x(rebalance_enabled,		u8,				\

	  OPT_FS|OPT_MOUNT,						\

	  OPT_BOOL(),							\

	  BCH2_NO_SB_OPT,			true,			\

	  NULL,		"Enable rebalance: disable for debugging, or to\n"\

			"quiet the system when doing performance testing\n")\

	x(no_data_io,			u8,				\

	  OPT_MOUNT,							\

	  OPT_BOOL(),							\

fs/bcachefs/rebalance.c

+2 −2
Original line number Diff line number Diff line
@@ -338,9 +338,9 @@ static int do_rebalance(struct moving_context *ctxt) 
			     BTREE_ITER_all_snapshots);



	while (!bch2_move_ratelimit(ctxt)) {

		if (!r->enabled) {

		if (!c->opts.rebalance_enabled) {

			bch2_moving_ctxt_flush_all(ctxt);

			kthread_wait_freezable(r->enabled ||

			kthread_wait_freezable(c->opts.rebalance_enabled ||

					       kthread_should_stop());

		}

fs/bcachefs/rebalance_types.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ struct bch_fs_rebalance { 
	struct bbpos			scan_start;

	struct bbpos			scan_end;

	struct bch_move_stats		scan_stats;



	unsigned			enabled:1;

};



#endif /* _BCACHEFS_REBALANCE_TYPES_H */