From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46FA9C4332F for ; Mon, 21 Nov 2022 07:59:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229613AbiKUH7C (ORCPT ); Mon, 21 Nov 2022 02:59:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbiKUH7B (ORCPT ); Mon, 21 Nov 2022 02:59:01 -0500 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD2A9D65 for ; Sun, 20 Nov 2022 23:59:00 -0800 (PST) Received: by verein.lst.de (Postfix, from userid 2407) id 9F8D768AA6; Mon, 21 Nov 2022 08:58:57 +0100 (CET) Date: Mon, 21 Nov 2022 08:58:57 +0100 From: Christoph Hellwig To: Shinichiro Kawasaki Cc: Christoph Hellwig , "axboe@kernel.dk" , "linux-block@vger.kernel.org" , "kch@nvidia.com" Subject: Re: [PATCH 2/2] blk-mq: simplify blk_mq_realloc_tag_set_tags Message-ID: <20221121075857.GA24878@lst.de> References: <20221109100811.2413423-1-hch@lst.de> <20221109100811.2413423-2-hch@lst.de> <20221118140640.featvt3fxktfquwh@shindev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221118140640.featvt3fxktfquwh@shindev> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The fix looks good, but could be simplified a bit more: diff --git a/block/blk-mq.c b/block/blk-mq.c index ee16b4c34c6a5..cdd8efcec1916 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -4381,7 +4381,7 @@ static int blk_mq_realloc_tag_set_tags(struct blk_mq_tag_set *set, struct blk_mq_tags **new_tags; if (set->nr_hw_queues >= new_nr_hw_queues) - return 0; + goto done; new_tags = kcalloc_node(new_nr_hw_queues, sizeof(struct blk_mq_tags *), GFP_KERNEL, set->numa_node); @@ -4393,8 +4393,8 @@ static int blk_mq_realloc_tag_set_tags(struct blk_mq_tag_set *set, sizeof(*set->tags)); kfree(set->tags); set->tags = new_tags; +done: set->nr_hw_queues = new_nr_hw_queues; - return 0; }