| Message ID | 20250106100645.850445-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [01/10] block: fix docs for freezing of queue limits updates | expand |
On 1/6/25 7:06 PM, Christoph Hellwig wrote: > 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 <hch@lst.de> > --- > block/blk-settings.c | 3 ++- > include/linux/blkdev.h | 3 +-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/block/blk-settings.c b/block/blk-settings.c > index 8f09e33f41f6..4187c3e8a07f 100644 > --- a/block/blk-settings.c > +++ b/block/blk-settings.c > @@ -413,7 +413,8 @@ int blk_set_default_limits(struct queue_limits *lim) > * @lim: limits to apply > * > * Apply the limits in @lim that were obtained from queue_limits_start_update() > - * and updated by the caller to @q. > + * and updated by the caller to @q. The caller must have frozen the queue or > + * ensured that there is outstanding I/O by other means. ...ensure that there are no outstanding I/Os by other means. > * > * Returns 0 if successful, else a negative error code. > */ > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h > index 5d40af2ef971..e781d4e6f92d 100644 > --- a/include/linux/blkdev.h > +++ b/include/linux/blkdev.h > @@ -944,8 +944,7 @@ static inline unsigned int blk_boundary_sectors_left(sector_t offset, > * the caller can modify. The caller must call queue_limits_commit_update() > * to finish the update. > * > - * Context: process context. The caller must have frozen the queue or ensured > - * that there is outstanding I/O by other means. > + * Context: process context. > */ > static inline struct queue_limits > queue_limits_start_update(struct request_queue *q)
diff --git a/block/blk-settings.c b/block/blk-settings.c index 8f09e33f41f6..4187c3e8a07f 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -413,7 +413,8 @@ int blk_set_default_limits(struct queue_limits *lim) * @lim: limits to apply * * Apply the limits in @lim that were obtained from queue_limits_start_update() - * and updated by the caller to @q. + * and updated by the caller to @q. The caller must have frozen the queue or + * ensured that there is outstanding I/O by other means. * * Returns 0 if successful, else a negative error code. */ diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5d40af2ef971..e781d4e6f92d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -944,8 +944,7 @@ static inline unsigned int blk_boundary_sectors_left(sector_t offset, * the caller can modify. The caller must call queue_limits_commit_update() * to finish the update. * - * Context: process context. The caller must have frozen the queue or ensured - * that there is outstanding I/O by other means. + * Context: process context. */ static inline struct queue_limits queue_limits_start_update(struct request_queue *q)
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 <hch@lst.de> --- block/blk-settings.c | 3 ++- include/linux/blkdev.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-)