Commit 26aff849 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2023-12-10' of https://evilpiepirate.org/git/bcachefs 

Pull more bcachefs bugfixes from Kent Overstreet:

 - Fix a rare emergency shutdown path bug: dropping journal pins after
   the filesystem has mostly been torn down is not what we want.

 - Fix some concurrency issues with the btree write buffer and journal
   replay by not using the btree write buffer until journal replay is
   finished

 - A fixup from the prior patch to kill journal pre-reservations: at the
   start of the btree update path, where previously we took a
   pre-reservation, we do at least want to check the journal watermark.

 - Fix a race between dropping device metadata and btree node writes,
   which would re-add a pointer to a device that had just been dropped

 - Fix one of the SCRU lock warnings, in
   bch2_compression_stats_to_text().

 - Partial fix for a rare transaction paths overflow, when indirect
   extents had been split by background tasks, by not running certain
   triggers when they're not needed.

 - Fix for creating a snapshot with implicit source in a subdirectory of
   the containing subvolume

 - Don't unfreeze when we're emergency read-only

 - Fix for rebalance spinning trying to compress unwritten extentns

 - Another deleted_inodes fix, for directories

 - Fix a rare deadlock (usually just an unecessary wait) when flushing
   the journal with an open journal entry.

* tag 'bcachefs-2023-12-10' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: Close journal entry if necessary when flushing all pins
  bcachefs: Fix uninitialized var in bch2_journal_replay()
  bcachefs: Fix deleted inode check for dirs
  bcachefs: rebalance shouldn't attempt to compress unwritten extents
  bcachefs: don't attempt rw on unfreeze when shutdown
  bcachefs: Fix creating snapshot with implict source
  bcachefs: Don't run indirect extent trigger unless inserting/deleting
  bcachefs: Convert compression_stats to for_each_btree_key2
  bcachefs: Fix bch2_extent_drop_ptrs() call
  bcachefs: Fix a journal deadlock in replay
  bcachefs; Don't use btree write buffer until journal replay is finished
  bcachefs: Don't drop journal pins in exit path
parents 52bf9f6c a66ff26b

fs/bcachefs/btree_cache.c

+3 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "debug.h"

#include "errcode.h"

#include "error.h"

#include "journal.h"

#include "trace.h"



#include <linux/prefetch.h>
@@ -424,14 +425,11 @@ void bch2_fs_btree_cache_exit(struct bch_fs *c) 
		BUG_ON(btree_node_read_in_flight(b) ||

		       btree_node_write_in_flight(b));



		if (btree_node_dirty(b))

			bch2_btree_complete_write(c, b, btree_current_write(b));

		clear_btree_node_dirty_acct(c, b);



		btree_node_data_free(c, b);

	}



	BUG_ON(atomic_read(&c->btree_cache.dirty));

	BUG_ON(!bch2_journal_error(&c->journal) &&

	       atomic_read(&c->btree_cache.dirty));



	list_splice(&bc->freed_pcpu, &bc->freed_nonpcpu);

fs/bcachefs/btree_io.c

+2 −2
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ int bch2_btree_root_read(struct bch_fs *c, enum btree_id id, 
	return bch2_trans_run(c, __bch2_btree_root_read(trans, id, k, level));

}



void bch2_btree_complete_write(struct bch_fs *c, struct btree *b,

static void bch2_btree_complete_write(struct bch_fs *c, struct btree *b,

				      struct btree_write *w)

{

	unsigned long old, new, v = READ_ONCE(b->will_make_reachable);

fs/bcachefs/btree_io.h

+0 −3
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ void bch2_btree_node_read(struct bch_fs *, struct btree *, bool); 
int bch2_btree_root_read(struct bch_fs *, enum btree_id,

			 const struct bkey_i *, unsigned);



void bch2_btree_complete_write(struct bch_fs *, struct btree *,

			      struct btree_write *);



bool bch2_btree_post_write_cleanup(struct bch_fs *, struct btree *);



enum btree_write_flags {

fs/bcachefs/btree_key_cache.c

+0 −2
Original line number Diff line number Diff line
@@ -992,8 +992,6 @@ void bch2_fs_btree_key_cache_exit(struct btree_key_cache *bc) 
	list_for_each_entry_safe(ck, n, &items, list) {

		cond_resched();



		bch2_journal_pin_drop(&c->journal, &ck->journal);



		list_del(&ck->list);

		kfree(ck->k);

		six_lock_exit(&ck->c.lock);

fs/bcachefs/btree_update.c

+16 −0
Original line number Diff line number Diff line
@@ -554,6 +554,19 @@ int __must_check bch2_trans_update_seq(struct btree_trans *trans, u64 seq, 
						 BTREE_UPDATE_PREJOURNAL);

}



static noinline int bch2_btree_insert_clone_trans(struct btree_trans *trans,

						  enum btree_id btree,

						  struct bkey_i *k)

{

	struct bkey_i *n = bch2_trans_kmalloc(trans, bkey_bytes(&k->k));

	int ret = PTR_ERR_OR_ZERO(n);

	if (ret)

		return ret;



	bkey_copy(n, k);

	return bch2_btree_insert_trans(trans, btree, n, 0);

}



int __must_check bch2_trans_update_buffered(struct btree_trans *trans,

					    enum btree_id btree,

					    struct bkey_i *k)
@@ -564,6 +577,9 @@ int __must_check bch2_trans_update_buffered(struct btree_trans *trans, 
	EBUG_ON(trans->nr_wb_updates > trans->wb_updates_size);

	EBUG_ON(k->k.u64s > BTREE_WRITE_BUFERED_U64s_MAX);



	if (unlikely(trans->journal_replay_not_finished))

		return bch2_btree_insert_clone_trans(trans, btree, k);



	trans_for_each_wb_update(trans, i) {

		if (i->btree == btree && bpos_eq(i->k.k.p, k->k.p)) {

			bkey_copy(&i->k, k);