diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-10 17:02:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-10 17:02:48 +0100 |
| commit | a5b6244cf87c50358f5562b8f07f7ac35fc7f6b0 (patch) | |
| tree | 57496f15a09a3aacf2d4e99822e7e73ed64a0927 /mm/page-writeback.c | |
| parent | Merge tag 'firewire-fixes-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | Merge tag 'nvme-6.8-2023-02-08' of git://git.infradead.org/nvme into block-6.8 (diff) | |
| download | linux-a5b6244cf87c50358f5562b8f07f7ac35fc7f6b0.tar.xz linux-a5b6244cf87c50358f5562b8f07f7ac35fc7f6b0.zip | |
Merge tag 'block-6.8-2024-02-10' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- NVMe pull request via Keith:
- Update a potentially stale firmware attribute (Maurizio)
- Fixes for the recent verbose error logging (Keith, Chaitanya)
- Protection information payload size fix for passthrough (Francis)
- Fix for a queue freezing issue in virtblk (Yi)
- blk-iocost underflow fix (Tejun)
- blk-wbt task detection fix (Jan)
* tag 'block-6.8-2024-02-10' of git://git.kernel.dk/linux:
virtio-blk: Ensure no requests in virtqueues before deleting vqs.
blk-iocost: Fix an UBSAN shift-out-of-bounds warning
nvme: use ns->head->pi_size instead of t10_pi_tuple structure size
nvme-core: fix comment to reflect right functions
nvme: move passthrough logging attribute to head
blk-wbt: Fix detection of dirty-throttled tasks
nvme-host: fix the updating of the firmware version
Diffstat (limited to 'mm/page-writeback.c')
| -rw-r--r-- | mm/page-writeback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 02147b61712b..3f255534986a 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1921,7 +1921,7 @@ pause: break; } __set_current_state(TASK_KILLABLE); - wb->dirty_sleep = now; + bdi->last_bdp_sleep = jiffies; io_schedule_timeout(pause); current->dirty_paused_when = now + pause; |