blk-mq: streamline blk_mq_get_request

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

block/blk-mq.c

@@ -302,13 +302,17 @@ static struct request *blk_mq_get_request(struct request_queue *q,
 			rq = e->type->ops.mq.get_request(q, op, data);
 			if (rq)
 				rq->rq_flags |= RQF_QUEUED;
-		} else
-			rq = __blk_mq_alloc_request(data, op);
-	} else {
+			goto allocated;
+		}
+	}
+
 	rq = __blk_mq_alloc_request(data, op);
+allocated:
+	if (!rq) {
+		blk_queue_exit(q);
+		return NULL;
 	}
 
-	if (rq) {
 	if (!op_is_flush(op)) {
 		rq->elv.icq = NULL;
 		if (e && e->type->icq_cache)
@@ -316,10 +320,6 @@ static struct request *blk_mq_get_request(struct request_queue *q,
 	}
 	data->hctx->queued++;
 	return rq;
-	}
-
-	blk_queue_exit(q);
-	return NULL;
 }
 
 struct request *blk_mq_alloc_request(struct request_queue *q, int rw,