From patchwork Wed Jun 8 12:30:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9164463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C223A60572 for ; Wed, 8 Jun 2016 12:31:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2B3027248 for ; Wed, 8 Jun 2016 12:31:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A783527BE5; Wed, 8 Jun 2016 12:31:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5519F27248 for ; Wed, 8 Jun 2016 12:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161599AbcFHMbO (ORCPT ); Wed, 8 Jun 2016 08:31:14 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:52238 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161360AbcFHMbO (ORCPT ); Wed, 8 Jun 2016 08:31:14 -0400 Received: from [83.175.99.196] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAcdc-0008V8-OY; Wed, 08 Jun 2016 12:31:13 +0000 From: Christoph Hellwig To: keith.busch@intel.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@lightbits.io, ming.l@ssi.samsung.com Subject: [PATCH 01/11] Revert "blk-mq: add blk_mq_alloc_request_hctx" Date: Wed, 8 Jun 2016 14:30:56 +0200 Message-Id: <1465389066-19119-2-git-send-email-hch@lst.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465389066-19119-1-git-send-email-hch@lst.de> References: <1465389066-19119-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Just for book keeping. The next patch brings it back with some changes. This reverts commit 98878e0f0b80520575b31147f7cff28e28d9a725. --- block/blk-mq.c | 33 --------------------------------- include/linux/blk-mq.h | 2 -- 2 files changed, 35 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 049356d..13f4603 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -267,39 +267,6 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, } EXPORT_SYMBOL(blk_mq_alloc_request); -struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, - unsigned int flags, unsigned int hctx_idx) -{ - struct blk_mq_hw_ctx *hctx; - struct blk_mq_ctx *ctx; - struct request *rq; - struct blk_mq_alloc_data alloc_data; - int ret; - - ret = blk_queue_enter(q, flags & BLK_MQ_REQ_NOWAIT); - if (ret) - return ERR_PTR(ret); - - hctx = q->queue_hw_ctx[hctx_idx]; - ctx = __blk_mq_get_ctx(q, cpumask_first(hctx->cpumask)); - - blk_mq_set_alloc_data(&alloc_data, q, flags, ctx, hctx); - - rq = __blk_mq_alloc_request(&alloc_data, rw); - if (!rq && !(flags & BLK_MQ_REQ_NOWAIT)) { - __blk_mq_run_hw_queue(hctx); - - rq = __blk_mq_alloc_request(&alloc_data, rw); - } - if (!rq) { - blk_queue_exit(q); - return ERR_PTR(-EWOULDBLOCK); - } - - return rq; -} -EXPORT_SYMBOL(blk_mq_alloc_request_hctx); - static void __blk_mq_free_request(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, struct request *rq) { diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 9a5d581..faa7d5c2 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -198,8 +198,6 @@ enum { struct request *blk_mq_alloc_request(struct request_queue *q, int rw, unsigned int flags); -struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, - unsigned int flags, unsigned int hctx_idx); struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag); struct cpumask *blk_mq_tags_cpumask(struct blk_mq_tags *tags);