]> git.hungrycats.org Git - linux/commitdiff
btrfs: stripe_alloc: do not count a writeback ENOSPC drop's give-back as supply ...
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sun, 25 Oct 2026 10:27:49 +0000 (06:27 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 2 Nov 2026 02:16:30 +0000 (21:16 -0500)
The hunks of "btrfs: stripe_alloc: do not count a writeback ENOSPC
drop's give-back as supply" (earlier in this series) that need code from
"btrfs: stripe_alloc: log the space counters when data writeback hits
ENOSPC", which comes after it in this series: they are applied here,
once "btrfs: stripe_alloc: log the space counters when data writeback
hits ENOSPC" is in, instead of with the rest of "btrfs: stripe_alloc: do
not count a writeback ENOSPC drop's give-back as supply".

Assisted-by: Claude:claude-opus-5-5
fs/btrfs/extent-tree.c

index 2fd40907cac6224864e16b40a5ea3d201a46c1f3..cf54a9d35f1d14b8f0dd13448bc3b2d870bd833c 100644 (file)
@@ -5204,7 +5204,7 @@ again:
                        sinfo = btrfs_find_space_info(fs_info, flags);
                        if (sinfo && __ratelimit(&rs)) {
                                btrfs_warn(fs_info,
-       "stripe_alloc: data writeback allocation of %llu bytes returned ENOSPC despite reservation margin; buffered data in this range will be dropped: claimable %llu claimable_reloc %llu open %llu trapped %llu stranded %llu may_use %llu margin %llu unmanaged_free %lld reserved %llu total %llu unit %llu",
+       "stripe_alloc: data writeback allocation of %llu bytes returned ENOSPC despite reservation margin; buffered data in this range will be dropped: claimable %llu claimable_reloc %llu open %llu trapped %llu stranded %llu may_use %llu margin %llu unmanaged_free %lld reserved %llu total %llu unit %llu quarantine %llu",
                                           num_bytes,
                                           sinfo->bytes_stripe_claimable,
                                           sinfo->bytes_stripe_claimable_reloc,
@@ -5216,7 +5216,8 @@ again:
                                           (s64)atomic64_read(&sinfo->bytes_unmanaged_free),
                                           sinfo->bytes_reserved,
                                           sinfo->total_bytes,
-                                          READ_ONCE(fs_info->stripe_margin_unit));
+                                          READ_ONCE(fs_info->stripe_margin_unit),
+                                          sinfo->bytes_stripe_quarantine);
                                if (IS_ENABLED(CONFIG_BTRFS_DEBUG))
                                        btrfs_dump_stripe_groups(sinfo);
                        }