From patchwork Tue Apr 23 12:29:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 10912861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBC85186D for ; Tue, 23 Apr 2019 12:30:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC1A128462 for ; Tue, 23 Apr 2019 12:30:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0A7F286C8; Tue, 23 Apr 2019 12:30:00 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 59D7F28689 for ; Tue, 23 Apr 2019 12:30:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727680AbfDWM37 (ORCPT ); Tue, 23 Apr 2019 08:29:59 -0400 Received: from mx2.suse.de ([195.135.220.15]:37892 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727674AbfDWM37 (ORCPT ); Tue, 23 Apr 2019 08:29:59 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C7367AE56; Tue, 23 Apr 2019 12:29:57 +0000 (UTC) From: Hannes Reinecke To: Ming Lei Cc: Christoph Hellwig , Jens Axboe , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, Hannes Reinecke , Hannes Reinecke Subject: [PATCH 2/5] blk-mq: drop 'hctx_idx' argument from blk_mq_alloc_hctx() Date: Tue, 23 Apr 2019 14:29:48 +0200 Message-Id: <20190423122951.134531-3-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190423122951.134531-1-hare@suse.de> References: <20190423122951.134531-1-hare@suse.de> 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 Unused. Signed-off-by: Hannes Reinecke --- block/blk-mq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 6f016d0cc69b..d16672bfa97d 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2324,8 +2324,7 @@ static int blk_mq_init_hctx(struct request_queue *q, static struct blk_mq_hw_ctx * blk_mq_alloc_hctx(struct request_queue *q, - struct blk_mq_tag_set *set, - unsigned hctx_idx, int node) + struct blk_mq_tag_set *set, int node) { struct blk_mq_hw_ctx *hctx; @@ -2753,7 +2752,7 @@ static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx( spin_unlock(&q->unused_hctx_lock); if (!hctx) - hctx = blk_mq_alloc_hctx(q, set, hctx_idx, node); + hctx = blk_mq_alloc_hctx(q, set, node); if (!hctx) goto fail;