Commit e20b269d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2024-06-05' of https://evilpiepirate.org/git/bcachefs 

Pull bcachefs fixes from Kent Overstreet:
 "Just a few small fixes"

* tag 'bcachefs-2024-06-05' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: Fix trans->locked assert
  bcachefs: Rereplicate now moves data off of durability=0 devices
  bcachefs: Fix GFP_KERNEL allocation in break_cycle()
parents 558dc49a 319fef29

fs/bcachefs/btree_locking.c

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle) 


	if (unlikely(!best)) {

		struct printbuf buf = PRINTBUF;

		buf.atomic++;



		prt_printf(&buf, bch2_fmt(g->g->trans->c, "cycle of nofail locks"));

fs/bcachefs/move.c

+15 −1
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ static int bch2_move_data_btree(struct moving_context *ctxt, 
		ctxt->stats->pos	= BBPOS(btree_id, start);

	}



	bch2_trans_begin(trans);

	bch2_trans_iter_init(trans, &iter, btree_id, start,

			     BTREE_ITER_prefetch|

			     BTREE_ITER_all_snapshots);
@@ -920,7 +921,20 @@ static bool rereplicate_pred(struct bch_fs *c, void *arg, 
		? c->opts.metadata_replicas

		: io_opts->data_replicas;



	if (!nr_good || nr_good >= replicas)

	rcu_read_lock();

	struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);

	unsigned i = 0;

	bkey_for_each_ptr(ptrs, ptr) {

		struct bch_dev *ca = bch2_dev_rcu(c, ptr->dev);

		if (!ptr->cached &&

		    (!ca || !ca->mi.durability))

			data_opts->kill_ptrs |= BIT(i);

		i++;

	}

	rcu_read_unlock();



	if (!data_opts->kill_ptrs &&

	    (!nr_good || nr_good >= replicas))

		return false;



	data_opts->target		= 0;