From patchwork Mon Aug 9 14:29:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 493871 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp2977186jap; Mon, 9 Aug 2021 07:38:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVVkRCfVPgTKKrkJHn+bcytpnCAoOqx/o9Jaip/RbhYJE+4aR5nT7qiTOh6z2af6Yiih3x X-Received: by 2002:a5e:d91a:: with SMTP id n26mr374872iop.96.1628519884526; Mon, 09 Aug 2021 07:38:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628519884; cv=none; d=google.com; s=arc-20160816; b=naqR5uk76oT5DrvUH9RYjTR7kF59f56Y8YFivacyWk8iWrh/cneRQt9ZW0GPB2+na0 dI5ZA73NjAx+7mFCXJD/A23pwb6JjRBukhbx00xLSog+eORgIWxK9zoMhZ4oFtHuUK+S oqTRAS4Obu0Q/Dnr5wlgMZKWQldlxbzC4yHT0JGvKlW8Szm0OWSMehojIChQC0LLn5Zk sTYtvwL2IMD7tspvqUaS45kzN0qnbwmwiqDaG08o8qIueL20vEUTpbjiGKqF7i6MqygM guAlRvx8yH2vR93QXMxAXqtOlCjdzpH7myp+xhMh3UizlmDAyFj1COKAkSHdiQrXB/lo hWCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=WN395213LYDhU3axw/Ycio+wDHie6EeXR/2LCytdilw=; b=jkWgoLGEkRB/EID0LvZX6YC5GL7ZMBddlA2JbcjchHynfoYpDxYFhmZeUuGsOho2Yc 4Zk3PlG/ebacXrvm9hk2VRCXHDpeXDe8oejgOo+Msf5TWa24r2v2nroTvSzBZHFkiH4W Zj+9MrQ6c4IfoyYtSYMDky/5K6heJj6MKhpbd0vpZNrjx3ATQBXmjfSPyTI6OMBigonC cMxM16axbW3ACBhej/mYfp36M0OMxyU1PEE0UOQugBXCRrOQQZtrcxO7vgG1oxKXa9EP Ewuw+e8NbKr8cUF4iMWPstGGM+7HJdM0+PkLCRyUXDTCJfGHg27FkPACrfE6xoSVG4oJ 2cvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si21191782iov.104.2021.08.09.07.38.04 for ; Mon, 09 Aug 2021 07:38:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235438AbhHIOiG (ORCPT ); Mon, 9 Aug 2021 10:38:06 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3610 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235266AbhHIOfA (ORCPT ); Mon, 9 Aug 2021 10:35:00 -0400 Received: from fraeml714-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Gjz9W2dt1z6CB0Y; Mon, 9 Aug 2021 22:34:07 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml714-chm.china.huawei.com (10.206.15.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Mon, 9 Aug 2021 16:34:36 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 15:34:33 +0100 From: John Garry To: , , CC: , , , , , , John Garry Subject: [PATCH v2 04/11] blk-mq: Invert check in blk_mq_update_nr_requests() Date: Mon, 9 Aug 2021 22:29:31 +0800 Message-ID: <1628519378-211232-5-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1628519378-211232-1-git-send-email-john.garry@huawei.com> References: <1628519378-211232-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org It's easier to read: if (x) X; else Y; over: if (!x) Y; else X; No functional change intended. Signed-off-by: John Garry --- block/blk-mq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.26.2 Reviewed-by: Ming Lei diff --git a/block/blk-mq.c b/block/blk-mq.c index 0e4825ca9869..42c4b8d1a570 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -3621,18 +3621,18 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) * If we're using an MQ scheduler, just update the scheduler * queue depth. This is similar to what the old code would do. */ - if (!hctx->sched_tags) { - ret = blk_mq_tag_update_depth(hctx, &hctx->tags, nr, - false); - } else { + if (hctx->sched_tags) { ret = blk_mq_tag_update_depth(hctx, &hctx->sched_tags, - nr, true); + nr, true); if (blk_mq_is_sbitmap_shared(set->flags)) { hctx->sched_tags->bitmap_tags = &q->sched_bitmap_tags; hctx->sched_tags->breserved_tags = &q->sched_breserved_tags; } + } else { + ret = blk_mq_tag_update_depth(hctx, &hctx->tags, nr, + false); } if (ret) break;