aboutsummaryrefslogtreecommitdiffstats
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2025-05-28 11:59:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-05-28 11:59:25 -0700
commita56baa225308e697163e74bae0cc623a294073d4 (patch)
treed1d3a7069cd91519cf00af016d7ddc085d4abf5d
parentb08494a8f7416e5f09907318c5460ad6f6e2a548 (diff)
parentb83825a8f56a34e7352e424aae64ffe6b88247d1 (diff)
downloadipsec-a56baa225308e697163e74bae0cc623a294073d4.tar.gz
Merge tag 'for-6.16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba: "A fixup to the xarray conversion sent in the main 6.16 batch. It was not included because it would cause rebase/refresh of like 80 patches, right before sending the early pull request last week. It's fixing a bug when zoned mode is enabled on btrfs so it's not affecting most people" * tag 'for-6.16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: don't drop a reference if btrfs_check_write_meta_pointer() fails
-rw-r--r--fs/btrfs/extent_io.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index e43f6280f9543a..84919976866460 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2189,7 +2189,6 @@ retry:
done = 1;
break;
}
- free_extent_buffer(eb);
continue;
}