Skip to content

Commit ff956a3

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: use queue_limits_commit_update in queue_discard_max_store
Convert queue_discard_max_store to use queue_limits_commit_update to check and update the max_discard_sectors limit and freeze the queue before doing so to ensure we don't have requests in flight while changing the limits. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Link: https://lore.kernel.org/r/20240213073425.1621680-8-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 4f563a6 commit ff956a3

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

block/blk-sysfs.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ static ssize_t queue_discard_max_store(struct request_queue *q,
175175
const char *page, size_t count)
176176
{
177177
unsigned long max_discard_bytes;
178+
struct queue_limits lim;
178179
ssize_t ret;
180+
int err;
179181

180182
ret = queue_var_store(&max_discard_bytes, page, count);
181183
if (ret < 0)
@@ -187,9 +189,14 @@ static ssize_t queue_discard_max_store(struct request_queue *q,
187189
if ((max_discard_bytes >> SECTOR_SHIFT) > UINT_MAX)
188190
return -EINVAL;
189191

190-
q->limits.max_user_discard_sectors = max_discard_bytes >> SECTOR_SHIFT;
191-
q->limits.max_discard_sectors = min(q->limits.max_hw_discard_sectors,
192-
q->limits.max_user_discard_sectors);
192+
blk_mq_freeze_queue(q);
193+
lim = queue_limits_start_update(q);
194+
lim.max_user_discard_sectors = max_discard_bytes >> SECTOR_SHIFT;
195+
err = queue_limits_commit_update(q, &lim);
196+
blk_mq_unfreeze_queue(q);
197+
198+
if (err)
199+
return err;
193200
return ret;
194201
}
195202

0 commit comments

Comments
 (0)