Skip to content

Commit c06bc5a

Browse files
bvanasscheaxboe
authored andcommitted
block/mq-deadline: Remove a WARN_ON_ONCE() call
The purpose of the WARN_ON_ONCE() statement in dd_insert_request() is to verify that dd_prepare_request() cleared rq->elv.priv[0]. Since dd_prepare_request() is called during request initialization but not if a request is requeued, a warning is triggered if a request is requeued. Fix this by removing the WARN_ON_ONCE() statement. This patch suppresses the following kernel warning: WARNING: CPU: 28 PID: 432 at block/mq-deadline-main.c:740 dd_insert_request+0x4d4/0x5b0 Workqueue: kblockd blk_mq_requeue_work Call Trace: dd_insert_requests+0xfa/0x130 blk_mq_sched_insert_request+0x22c/0x240 blk_mq_requeue_work+0x21c/0x2d0 process_one_work+0x4c2/0xa70 worker_thread+0x2e5/0x6d0 kthread+0x21c/0x250 ret_from_fork+0x1f/0x30 Reported-by: Sachin Sant <[email protected]> Fixes: 08a9ad8 ("block/mq-deadline: Add cgroup support") Signed-off-by: Bart Van Assche <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent cb9516b commit c06bc5a

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

block/mq-deadline-main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,6 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
740740
dd_count(dd, inserted, prio);
741741
blkcg = dd_blkcg_from_bio(rq->bio);
742742
ddcg_count(blkcg, inserted, ioprio_class);
743-
WARN_ON_ONCE(rq->elv.priv[0]);
744743
rq->elv.priv[0] = blkcg;
745744

746745
if (blk_mq_sched_try_insert_merge(q, rq, &free)) {

0 commit comments

Comments
 (0)