diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-15 09:45:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-15 09:45:32 -0800 |
| commit | c9dd4571ad38654f26c07ff2b7c7dba03301fc76 (patch) | |
| tree | 9e3a3b42b7aa803fb8a6bfdc58b2c02ef69b53a3 | |
| parent | cfaaa7d010d1fc58f9717fcc8591201e741d2d49 (diff) | |
| parent | 7d493a5ecc26f861421af6e64427d5f697ddd395 (diff) | |
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
| -rw-r--r-- | fs/btrfs/delayed-ref.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 65d841d7142c..cab94d141f66 100644 --- 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); } |