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

Merge tag 'for-6.12-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "One more fix that seems urgent and good to have in 6.12 final.

  It could potentially lead to unexpected transaction aborts, due to
  wrong comparison and order of processing of delayed refs"

* tag 'for-6.12-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix incorrect comparison for delayed refs
parents cfaaa7d0 7d493a5e

fs/btrfs/delayed-ref.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int comp_refs(struct btrfs_delayed_ref_node *ref1, 
		if (ref1->ref_root < ref2->ref_root)

			return -1;

		if (ref1->ref_root > ref2->ref_root)

			return -1;

			return 1;

		if (ref1->type == BTRFS_EXTENT_DATA_REF_KEY)

			ret = comp_data_refs(ref1, ref2);

	}