blk-mq: remove wrong 'unlikely' check
authorhuhai <huhai@kylinos.cn>
Tue, 22 May 2018 09:39:34 +0000 (17:39 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 22 May 2018 14:38:04 +0000 (08:38 -0600)
When dispatch_rq_from_ctx is called, in the vast majority of cases
the ctx->rq_list is not empty.

Signed-off-by: huhai <huhai@kylinos.cn>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c

index 4cbfd78..df92820 100644 (file)
@@ -1036,7 +1036,7 @@ static bool dispatch_rq_from_ctx(struct sbitmap *sb, unsigned int bitnr,
        struct blk_mq_ctx *ctx = hctx->ctxs[bitnr];
 
        spin_lock(&ctx->lock);
-       if (unlikely(!list_empty(&ctx->rq_list))) {
+       if (!list_empty(&ctx->rq_list)) {
                dispatch_data->rq = list_entry_rq(ctx->rq_list.next);
                list_del_init(&dispatch_data->rq->queuelist);
                if (list_empty(&ctx->rq_list))