dm vdo: replace max_discard_sectors with max_hw_discard_sectors
authorBruce Johnston <bjohnsto@redhat.com>
Tue, 9 Jul 2024 17:00:36 +0000 (13:00 -0400)
committerMikulas Patocka <mpatocka@redhat.com>
Thu, 11 Jul 2024 19:24:41 +0000 (21:24 +0200)
Commit 4f563a64732d ("block: add a max_user_discard_sectors queue
limit") changed block core to set max_discard_sectors to:
min(lim->max_hw_discard_sectors, lim->max_user_discard_sectors)

Commit 825d8bbd2f32 ("dm: always manage discard support in terms
of max_hw_discard_sectors") fixed most dm targetss to deal with
this, by replacing max_discard_sectors with max_hw_discard_sectors.
Unfortunately, dm-vdo did not get fixed at that time.

Fixes: 825d8bbd2f32 ("dm: always manage discard support in terms of max_hw_discard_sectors")
Signed-off-by: Bruce Johnston <bjohnsto@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
drivers/md/dm-vdo/dm-vdo-target.c

index 5a4b0a927f560b053a502d9e777dcb8d97f51af1..af77084969e0991c2be3334aeb0da9560365a1a5 100644 (file)
@@ -945,7 +945,7 @@ static void vdo_io_hints(struct dm_target *ti, struct queue_limits *limits)
         * The value is used by dm-thin to determine whether to pass down discards. The block layer
         * splits large discards on this boundary when this is set.
         */
-       limits->max_discard_sectors =
+       limits->max_hw_discard_sectors =
                (vdo->device_config->max_discard_blocks * VDO_SECTORS_PER_BLOCK);
 
        /*