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

Merge tag 'bcachefs-2025-02-26' of git://evilpiepirate.org/bcachefs 

Pull bcachefs fixes from Kent Overstreet:
 "A couple small ones, the main user visible changes/fixes are:

   - Fix a bug where truncate would rarely fail and return 1

   - Revert the directory i_size code: this turned out to have a number
     of issues that weren't noticed because the fsck code wasn't
     correctly reporting errors (ouch), and we're late enough in the
     cycle that it can just wait until 6.15"

* tag 'bcachefs-2025-02-26' of git://evilpiepirate.org/bcachefs:
  bcachefs: Fix truncate sometimes failing and returning 1
  bcachefs: Fix deadlock
  bcachefs: Check for -BCH_ERR_open_buckets_empty in journal resize
  bcachefs: Revert directory i_size
  bcachefs: fix bch2_extent_ptr_eq()
  bcachefs: Fix memmove when move keys down
  bcachefs: print op->nonce on data update inconsistency
parents 102c16a1 eb54d269

fs/bcachefs/btree_cache.c

+5 −4
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *c) 
		return NULL;

	}



	bch2_btree_lock_init(&b->c, 0);

	bch2_btree_lock_init(&b->c, 0, GFP_KERNEL);



	__bch2_btree_node_to_freelist(bc, b);

	return b;
@@ -795,17 +795,18 @@ struct btree *bch2_btree_node_mem_alloc(struct btree_trans *trans, bool pcpu_rea 
		}



	b = __btree_node_mem_alloc(c, GFP_NOWAIT|__GFP_NOWARN);

	if (!b) {

	if (b) {

		bch2_btree_lock_init(&b->c, pcpu_read_locks ? SIX_LOCK_INIT_PCPU : 0, GFP_NOWAIT);

	} else {

		mutex_unlock(&bc->lock);

		bch2_trans_unlock(trans);

		b = __btree_node_mem_alloc(c, GFP_KERNEL);

		if (!b)

			goto err;

		bch2_btree_lock_init(&b->c, pcpu_read_locks ? SIX_LOCK_INIT_PCPU : 0, GFP_KERNEL);

		mutex_lock(&bc->lock);

	}



	bch2_btree_lock_init(&b->c, pcpu_read_locks ? SIX_LOCK_INIT_PCPU : 0);



	BUG_ON(!six_trylock_intent(&b->c.lock));

	BUG_ON(!six_trylock_write(&b->c.lock));

fs/bcachefs/btree_io.c

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int validate_bset_keys(struct bch_fs *c, struct btree *b, 
		}

got_good_key:

		le16_add_cpu(&i->u64s, -next_good_key);

		memmove_u64s_down(k, bkey_p_next(k), (u64 *) vstruct_end(i) - (u64 *) k);

		memmove_u64s_down(k, (u64 *) k + next_good_key, (u64 *) vstruct_end(i) - (u64 *) k);

		set_btree_node_need_rewrite(b);

	}

fsck_err:

fs/bcachefs/btree_key_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ bkey_cached_alloc(struct btree_trans *trans, struct btree_path *path, unsigned k 
	}



	if (ck) {

		bch2_btree_lock_init(&ck->c, pcpu_readers ? SIX_LOCK_INIT_PCPU : 0);

		bch2_btree_lock_init(&ck->c, pcpu_readers ? SIX_LOCK_INIT_PCPU : 0, GFP_KERNEL);

		ck->c.cached = true;

		goto lock;

	}

fs/bcachefs/btree_locking.c

+3 −2
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ 
static struct lock_class_key bch2_btree_node_lock_key;



void bch2_btree_lock_init(struct btree_bkey_cached_common *b,

			  enum six_lock_init_flags flags)

			  enum six_lock_init_flags flags,

			  gfp_t gfp)

{

	__six_lock_init(&b->lock, "b->c.lock", &bch2_btree_node_lock_key, flags);

	__six_lock_init(&b->lock, "b->c.lock", &bch2_btree_node_lock_key, flags, gfp);

	lockdep_set_notrack_class(&b->lock);

}

fs/bcachefs/btree_locking.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "btree_iter.h"

#include "six.h"



void bch2_btree_lock_init(struct btree_bkey_cached_common *, enum six_lock_init_flags);

void bch2_btree_lock_init(struct btree_bkey_cached_common *, enum six_lock_init_flags, gfp_t gfp);



void bch2_trans_unlock_noassert(struct btree_trans *);

void bch2_trans_unlock_write(struct btree_trans *);