[PATCH] dm vdo: replace max_discard_sectors with max_hw_discard_sectors

[PATCH] dm vdo: replace max_discard_sectors with max_hw_discard_sectors

[Matthew Sakai]

From: Bruce Johnston <bjohnsto@redhat.com>

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>
---
 drivers/md/dm-vdo/dm-vdo-target.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/dm-vdo/dm-vdo-target.c b/drivers/md/dm-vdo/dm-vdo-target.c
index 5a4b0a927f56..af77084969e0 100644
--- a/drivers/md/dm-vdo/dm-vdo-target.c
+++ b/drivers/md/dm-vdo/dm-vdo-target.c
@@ -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);
 
 	/*
-- 
2.45.2

Re: dm vdo: replace max_discard_sectors with max_hw_discard_sectors

[Mike Snitzer]

On Wed, Jul 10, 2024 at 03:37:30PM -0400, Matthew Sakai wrote:
> From: Bruce Johnston <bjohnsto@redhat.com>
> 
> 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>
> ---
>  drivers/md/dm-vdo/dm-vdo-target.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/md/dm-vdo/dm-vdo-target.c b/drivers/md/dm-vdo/dm-vdo-target.c
> index 5a4b0a927f56..af77084969e0 100644
> --- a/drivers/md/dm-vdo/dm-vdo-target.c
> +++ b/drivers/md/dm-vdo/dm-vdo-target.c
> @@ -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);
>  
>  	/*
> -- 
> 2.45.2
> 
> 

Not sure why I missed vdo, sorry about that.

Reviewed-by: Mike Snitzer <snitzer@kernel.org>