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

torvalds · torvalds · commit c9dd4571ad38 · 2024-11-15T09:45:32.000-08:00
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
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ static int comp_refs(struct btrfs_delayed_ref_node *ref1,`
`298`	`298`	`if (ref1->ref_root < ref2->ref_root)`
`299`	`299`	`return -1;`
`300`	`300`	`if (ref1->ref_root > ref2->ref_root)`
`301`		`- return -1;`
	`301`	`+ return 1;`
`302`	`302`	`if (ref1->type == BTRFS_EXTENT_DATA_REF_KEY)`
`303`	`303`	`ret = comp_data_refs(ref1, ref2);`
`304`	`304`	`}`