aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-09-19 12:26:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-09-19 12:26:20 -0700
commit1522b530ac3e2dadd75ccb351b88d3c7c4cf584e (patch)
treee45a503084bfe4800dfddcafe984ee8334327d9a /drivers/block
parentMerge tag 'io_uring-6.17-20250919' of git://git.kernel.dk/linux (diff)
parentdrbd: init queue_limits->max_hw_wzeroes_unmap_sectors parameter (diff)
downloadlinux-1522b530ac3e2dadd75ccb351b88d3c7c4cf584e.tar.gz
linux-1522b530ac3e2dadd75ccb351b88d3c7c4cf584e.zip
Merge tag 'block-6.17-20250918' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe: "A set of fixes for an issue with md array assembly and drbd for devices supporting write zeros" * tag 'block-6.17-20250918' of git://git.kernel.dk/linux: drbd: init queue_limits->max_hw_wzeroes_unmap_sectors parameter md: init queue_limits->max_hw_wzeroes_unmap_sectors parameter
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_nl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index e09930c2b226..91f3b8afb63c 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1330,6 +1330,7 @@ void drbd_reconsider_queue_parameters(struct drbd_device *device,
lim.max_write_zeroes_sectors = DRBD_MAX_BBIO_SECTORS;
else
lim.max_write_zeroes_sectors = 0;
+ lim.max_hw_wzeroes_unmap_sectors = 0;
if ((lim.discard_granularity >> SECTOR_SHIFT) >
lim.max_hw_discard_sectors) {