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

bcachefs: Fix missing BTREE_TRIGGER_bucket_invalidate flag 



This fixes an accounting mismatch for cached data.

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

fs/bcachefs/alloc_background.c

+4 −3
Original line number Diff line number Diff line
@@ -477,7 +477,8 @@ bch2_trans_start_alloc_update_noupdate(struct btree_trans *trans, struct btree_i 
}



__flatten

struct bkey_i_alloc_v4 *bch2_trans_start_alloc_update(struct btree_trans *trans, struct bpos pos)

struct bkey_i_alloc_v4 *bch2_trans_start_alloc_update(struct btree_trans *trans, struct bpos pos,

						      enum btree_iter_update_trigger_flags flags)

{

	struct btree_iter iter;

	struct bkey_i_alloc_v4 *a = bch2_trans_start_alloc_update_noupdate(trans, &iter, pos);
@@ -485,7 +486,7 @@ struct bkey_i_alloc_v4 *bch2_trans_start_alloc_update(struct btree_trans *trans, 
	if (ret)

		return ERR_PTR(ret);



	ret = bch2_trans_update(trans, &iter, &a->k_i, 0);

	ret = bch2_trans_update(trans, &iter, &a->k_i, flags);

	bch2_trans_iter_exit(trans, &iter);

	return unlikely(ret) ? ERR_PTR(ret) : a;

}
@@ -2006,7 +2007,7 @@ static int invalidate_one_bucket(struct btree_trans *trans, 
	if (bch2_bucket_is_open_safe(c, bucket.inode, bucket.offset))

		return 0;



	a = bch2_trans_start_alloc_update(trans, bucket);

	a = bch2_trans_start_alloc_update(trans, bucket, BTREE_TRIGGER_bucket_invalidate);

	ret = PTR_ERR_OR_ZERO(a);

	if (ret)

		goto out;

fs/bcachefs/alloc_background.h

+2 −1
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ static inline void set_alloc_v4_u64s(struct bkey_i_alloc_v4 *a) 
struct bkey_i_alloc_v4 *

bch2_trans_start_alloc_update_noupdate(struct btree_trans *, struct btree_iter *, struct bpos);

struct bkey_i_alloc_v4 *

bch2_trans_start_alloc_update(struct btree_trans *, struct bpos);

bch2_trans_start_alloc_update(struct btree_trans *, struct bpos,

			      enum btree_iter_update_trigger_flags);



void __bch2_alloc_to_v4(struct bkey_s_c, struct bch_alloc_v4 *);

fs/bcachefs/buckets.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int bch2_trigger_pointer(struct btree_trans *trans, 
	*sectors = insert ? bp.bucket_len : -((s64) bp.bucket_len);



	if (flags & BTREE_TRIGGER_transactional) {

		struct bkey_i_alloc_v4 *a = bch2_trans_start_alloc_update(trans, bucket);

		struct bkey_i_alloc_v4 *a = bch2_trans_start_alloc_update(trans, bucket, 0);

		ret = PTR_ERR_OR_ZERO(a) ?:

			__mark_pointer(trans, ca, k, &p, *sectors, bp.data_type, &a->v);

		if (ret)

fs/bcachefs/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int mark_stripe_bucket(struct btree_trans *trans, 


	if (flags & BTREE_TRIGGER_transactional) {

		struct bkey_i_alloc_v4 *a =

			bch2_trans_start_alloc_update(trans, bucket);

			bch2_trans_start_alloc_update(trans, bucket, 0);

		ret = PTR_ERR_OR_ZERO(a) ?:

			__mark_stripe_bucket(trans, ca, s, ptr_idx, deleting, bucket, &a->v, flags);

	}