linux-next: manual merge of the bcachefs tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the bcachefs tree got a conflict in:

  fs/bcachefs/backpointers.c

between commit:

  92e1c29ae803 ("bcachefs: bch2_btree_write_buffer_maybe_flush()")

from Linus' tree and commit:

  f75ad706a1cf ("bcachefs: fsck_err() may now take a btree_trans")

from the bcachefs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/bcachefs/backpointers.c
index 6d8b1bc90be0,ca16fa5de7c8..000000000000
--- a/fs/bcachefs/backpointers.c
+++ b/fs/bcachefs/backpointers.c
@@@ -903,18 -925,20 +903,18 @@@ static int check_one_backpointer(struc
  	if (ret)
  		return ret;
  
 -	if (!k.k && !bpos_eq(*last_flushed_pos, bp.k->p)) {
 -		*last_flushed_pos = bp.k->p;
 -		ret = bch2_btree_write_buffer_flush_sync(trans) ?:
 -			-BCH_ERR_transaction_restart_write_buffer_flush;
 -		goto out;
 -	}
 +	if (!k.k) {
 +		ret = bch2_btree_write_buffer_maybe_flush(trans, bp.s_c, last_flushed);
 +		if (ret)
 +			goto out;
  
- 		if (fsck_err(c, backpointer_to_missing_ptr,
 -	if (fsck_err_on(!k.k,
 -			trans, backpointer_to_missing_ptr,
 -			"backpointer for missing %s\n  %s",
 -			bp.v->level ? "btree node" : "extent",
 -			(bch2_bkey_val_to_text(&buf, c, bp.s_c), buf.buf))) {
 -		ret = bch2_btree_delete_at_buffered(trans, BTREE_ID_backpointers, bp.k->p);
 -		goto out;
++		if (fsck_err(trans, backpointer_to_missing_ptr,
 +			     "backpointer for missing %s\n  %s",
 +			     bp.v->level ? "btree node" : "extent",
 +			     (bch2_bkey_val_to_text(&buf, c, bp.s_c), buf.buf))) {
 +			ret = bch2_btree_delete_at_buffered(trans, BTREE_ID_backpointers, bp.k->p);
 +			goto out;
 +		}
  	}
  out:
  fsck_err:

Attachment: pgp4Jv2c3fKHC.pgp
Description: OpenPGP digital signature