blk-mq: Clean up blk_mq_requeue_work()

Move a statement that occurs in both branches of an if-statement in front
of the if-statement. Fix a typo in a source code comment. No functionality
has been changed.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20241212212941.1268662-3-bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2024-12-12 13:29:40 -08:00 committed by Jens Axboe
parent e01424fab3
commit 312ccd4b75

View File

@ -1544,19 +1544,17 @@ static void blk_mq_requeue_work(struct work_struct *work)
while (!list_empty(&rq_list)) { while (!list_empty(&rq_list)) {
rq = list_entry(rq_list.next, struct request, queuelist); rq = list_entry(rq_list.next, struct request, queuelist);
list_del_init(&rq->queuelist);
/* /*
* If RQF_DONTPREP ist set, the request has been started by the * If RQF_DONTPREP is set, the request has been started by the
* driver already and might have driver-specific data allocated * driver already and might have driver-specific data allocated
* already. Insert it into the hctx dispatch list to avoid * already. Insert it into the hctx dispatch list to avoid
* block layer merges for the request. * block layer merges for the request.
*/ */
if (rq->rq_flags & RQF_DONTPREP) { if (rq->rq_flags & RQF_DONTPREP)
list_del_init(&rq->queuelist);
blk_mq_request_bypass_insert(rq, 0); blk_mq_request_bypass_insert(rq, 0);
} else { else
list_del_init(&rq->queuelist);
blk_mq_insert_request(rq, BLK_MQ_INSERT_AT_HEAD); blk_mq_insert_request(rq, BLK_MQ_INSERT_AT_HEAD);
}
} }
while (!list_empty(&flush_list)) { while (!list_empty(&flush_list)) {