Skip to content

Commit 9c96821

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: fix docs for freezing of queue limits updates
queue_limits_commit_update is the function that needs to operate on a frozen queue, not queue_limits_start_update. Update the kerneldoc comments to reflect that. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Ming Lei <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Reviewed-by: Nilay Shroff <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Reviewed-by: John Garry <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 844b8cd commit 9c96821

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

block/blk-settings.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,8 @@ int blk_set_default_limits(struct queue_limits *lim)
413413
* @lim: limits to apply
414414
*
415415
* Apply the limits in @lim that were obtained from queue_limits_start_update()
416-
* and updated by the caller to @q.
416+
* and updated by the caller to @q. The caller must have frozen the queue or
417+
* ensure that there are no outstanding I/Os by other means.
417418
*
418419
* Returns 0 if successful, else a negative error code.
419420
*/

include/linux/blkdev.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,7 @@ static inline unsigned int blk_boundary_sectors_left(sector_t offset,
944944
* the caller can modify. The caller must call queue_limits_commit_update()
945945
* to finish the update.
946946
*
947-
* Context: process context. The caller must have frozen the queue or ensured
948-
* that there is outstanding I/O by other means.
947+
* Context: process context.
949948
*/
950949
static inline struct queue_limits
951950
queue_limits_start_update(struct request_queue *q)

0 commit comments

Comments
 (0)