On 2/12/24 15:45, Christoph Hellwig wrote:
> blk_set_stacking_limits uses very little from blk_set_default_limits.
> Open code these initializations in preparation for rewriting
> blk_set_default_limits.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-settings.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/block/blk-settings.c b/block/blk-settings.c
> index f16d3fec6658e5..1cae2db41490d2 100644
> --- a/block/blk-settings.c
> +++ b/block/blk-settings.c
> @@ -65,13 +65,16 @@ void blk_set_default_limits(struct queue_limits *lim)
> * blk_set_stacking_limits - set default limits for stacking devices
> * @lim: the queue_limits structure to reset
> *
> - * Description:
> - * Returns a queue_limit struct to its default state. Should be used
> - * by stacking drivers like DM that have no internal limits.
> + * Prepare queue limits for applying limits from underlying devices using
> + * blk_stack_limits().
> */
> void blk_set_stacking_limits(struct queue_limits *lim)
> {
> - blk_set_default_limits(lim);
> + memset(lim, 0, sizeof(*lim));
> + lim->logical_block_size = lim->physical_block_size = lim->io_min = 512;
> + lim->discard_granularity = 512;
Super minor nit: SECTOR_SIZE would be nice here.
> + lim->dma_alignment = 511;
> + lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
>
> /* Inherit limits from component devices */
> lim->max_segments = USHRT_MAX;
Reviewed-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
--
Damien Le Moal
Western Digital Research
