diff options
author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 20:42:00 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 20:42:00 +0300 |
commit | 570d58b12fbf7bae0ba72d929ccf914a4df5ca7c (patch) | |
tree | dfed4e4970ba5a5a4c4c726b4d55d9f4394683c3 /fs/btrfs/extent_io.c | |
parent | 502ad6e5a6196840976c4c84b2ea2f9769942fbe (diff) | |
parent | 92a09c47464d040866cf2b4cd052bc60555185fb (diff) | |
download | linux-570d58b12fbf7bae0ba72d929ccf914a4df5ca7c.tar.xz |
Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
Conflicts:
drivers/cpufreq/intel_pstate.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 197f5e51c474..8515c31f563b 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2047,7 +2047,7 @@ static int submit_eb_subpage(struct folio *folio, struct writeback_control *wbc) subpage->bitmaps)) { spin_unlock_irqrestore(&subpage->lock, flags); spin_unlock(&folio->mapping->i_private_lock); - bit_start++; + bit_start += sectors_per_node; continue; } |