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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/backing-dev-defs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index ae12696ec492..2ad261082bba 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -141,8 +141,6 @@ struct bdi_writeback { struct delayed_work dwork; /* work item used for writeback */ struct delayed_work bw_dwork; /* work item used for bandwidth estimate */ - unsigned long dirty_sleep; /* last wait */ - struct list_head bdi_node; /* anchored at bdi->wb_list */ #ifdef CONFIG_CGROUP_WRITEBACK @@ -179,6 +177,11 @@ struct backing_dev_info { * any dirty wbs, which is depended upon by bdi_has_dirty(). */ atomic_long_t tot_write_bandwidth; + /* + * Jiffies when last process was dirty throttled on this bdi. Used by + * blk-wbt. + */ + unsigned long last_bdp_sleep; struct bdi_writeback wb; /* the root writeback info for this bdi */ struct list_head wb_list; /* list of all wbs */ |