Skip to content

Commit c490f22

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: decouple blk_set_stacking_limits from blk_set_default_limits
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@lst.de> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hannes Reinecke <hare@suse.de> Link: https://lore.kernel.org/r/20240213073425.1621680-4-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent b994729 commit c490f22

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

block/blk-settings.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,18 @@ void blk_set_default_limits(struct queue_limits *lim)
6565
* blk_set_stacking_limits - set default limits for stacking devices
6666
* @lim: the queue_limits structure to reset
6767
*
68-
* Description:
69-
* Returns a queue_limit struct to its default state. Should be used
70-
* by stacking drivers like DM that have no internal limits.
68+
* Prepare queue limits for applying limits from underlying devices using
69+
* blk_stack_limits().
7170
*/
7271
void blk_set_stacking_limits(struct queue_limits *lim)
7372
{
74-
blk_set_default_limits(lim);
73+
memset(lim, 0, sizeof(*lim));
74+
lim->logical_block_size = SECTOR_SIZE;
75+
lim->physical_block_size = SECTOR_SIZE;
76+
lim->io_min = SECTOR_SIZE;
77+
lim->discard_granularity = SECTOR_SIZE;
78+
lim->dma_alignment = SECTOR_SIZE - 1;
79+
lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
7580

7681
/* Inherit limits from component devices */
7782
lim->max_segments = USHRT_MAX;

0 commit comments

Comments
 (0)