Commit 0a2e2305 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2024-04-29' of https://evilpiepirate.org/git/bcachefs 

Pull bcachefs fixes from Kent Overstreet:
 "Tiny set of fixes this time"

* tag 'bcachefs-2024-04-29' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: fix integer conversion bug
  bcachefs: btree node scan now fills in sectors_written
  bcachefs: Remove accidental debug assert
parents b947cc5b c258c08a

fs/bcachefs/btree_node_scan.c

+5 −2
Original line number Diff line number Diff line
@@ -57,13 +57,14 @@ static void found_btree_node_to_key(struct bkey_i *k, const struct found_btree_n 
	bp->v.seq		= cpu_to_le64(f->cookie);

	bp->v.sectors_written	= 0;

	bp->v.flags		= 0;

	bp->v.sectors_written	= cpu_to_le16(f->sectors_written);

	bp->v.min_key		= f->min_key;

	SET_BTREE_PTR_RANGE_UPDATED(&bp->v, f->range_updated);

	memcpy(bp->v.start, f->ptrs, sizeof(struct bch_extent_ptr) * f->nr_ptrs);

}



static bool found_btree_node_is_readable(struct btree_trans *trans,

					 const struct found_btree_node *f)

					 struct found_btree_node *f)

{

	struct { __BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX); } k;
@@ -71,8 +72,10 @@ static bool found_btree_node_is_readable(struct btree_trans *trans, 


	struct btree *b = bch2_btree_node_get_noiter(trans, &k.k, f->btree_id, f->level, false);

	bool ret = !IS_ERR_OR_NULL(b);

	if (ret)

	if (ret) {

		f->sectors_written = b->written;

		six_unlock_read(&b->c.lock);

	}



	/*

	 * We might update this node's range; if that happens, we need the node

fs/bcachefs/btree_node_scan_types.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ struct found_btree_node { 
	bool			overwritten:1;

	u8			btree_id;

	u8			level;

	unsigned		sectors_written;

	u32			seq;

	u64			cookie;

fs/bcachefs/buckets.c

+0 −2
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ int bch2_mark_metadata_bucket(struct bch_fs *c, struct bch_dev *ca, 
			"different types of data in same bucket: %s, %s",

			bch2_data_type_str(g->data_type),

			bch2_data_type_str(data_type))) {

		BUG();

		ret = -EIO;

		goto err;

	}
@@ -629,7 +628,6 @@ int bch2_check_bucket_ref(struct btree_trans *trans, 
			bch2_data_type_str(ptr_data_type),

			(printbuf_reset(&buf),

			 bch2_bkey_val_to_text(&buf, c, k), buf.buf));

		BUG();

		ret = -EIO;

		goto err;

	}

fs/bcachefs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ int bch2_trigger_inode(struct btree_trans *trans, 
		       struct bkey_s new,

		       unsigned flags)

{

	s64 nr = bkey_is_inode(new.k) - bkey_is_inode(old.k);

	s64 nr = (s64) bkey_is_inode(new.k) - (s64) bkey_is_inode(old.k);



	if (flags & BTREE_TRIGGER_TRANSACTIONAL) {

		if (nr) {