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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 142EDC352BE for ; Thu, 16 Apr 2020 13:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB27920732 for ; Thu, 16 Apr 2020 13:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587045452; bh=LAIjssrxcqhHTuaqxyWX25CGsFD7yghpLh18RT6Ivr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=04RINs0a49h0xUi5icNH9jZbnfUd1hCHnta45Dvspb1LarIRQQLi6heBh2WlEHEfo /UXdMkZNbLjNNu1eB/k15q6mrN5Pm5NDwL7uQt9UmH8wWLmB5xCcQYoMhgaO/kIaLl yuVfzkwxoLh6vBsqnRisyMu+KKMMqUfjcpL9qAEc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503530AbgDPN5b (ORCPT ); Thu, 16 Apr 2020 09:57:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:51568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897897AbgDPNjN (ORCPT ); Thu, 16 Apr 2020 09:39:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3B36221F7; Thu, 16 Apr 2020 13:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044353; bh=LAIjssrxcqhHTuaqxyWX25CGsFD7yghpLh18RT6Ivr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mLntFyqlWsRGheBcusmlaUeoovJ5tQIkTpBqQPuroNSS9OvXpjTeXmk1YhWIVTYGD pFvs//+YlwPUOpySeEfyCuAASIgdfYa+f3vkJehyZSO6qPbvl0QNwjjcuwqSj3tZbI AyNiVyWMVL4sZpFSrlDG5NOpcdbu+7oWg7VNKkp4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bob Liu , Damien Le Moal , Mike Snitzer Subject: [PATCH 5.5 183/257] dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone() Date: Thu, 16 Apr 2020 15:23:54 +0200 Message-Id: <20200416131349.226208741@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.891903893@linuxfoundation.org> References: <20200416131325.891903893@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bob Liu commit b8fdd090376a7a46d17db316638fe54b965c2fb0 upstream. zmd->nr_rnd_zones was increased twice by mistake. The other place it is increased in dmz_init_zone() is the only one needed: 1131 zmd->nr_useable_zones++; 1132 if (dmz_is_rnd(zone)) { 1133 zmd->nr_rnd_zones++; ^^^ Fixes: 3b1a94c88b79 ("dm zoned: drive-managed zoned block device target") Cc: stable@vger.kernel.org Signed-off-by: Bob Liu Reviewed-by: Damien Le Moal Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-zoned-metadata.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/md/dm-zoned-metadata.c +++ b/drivers/md/dm-zoned-metadata.c @@ -1109,7 +1109,6 @@ static int dmz_init_zone(struct blk_zone switch (blkz->type) { case BLK_ZONE_TYPE_CONVENTIONAL: set_bit(DMZ_RND, &zone->flags); - zmd->nr_rnd_zones++; break; case BLK_ZONE_TYPE_SEQWRITE_REQ: case BLK_ZONE_TYPE_SEQWRITE_PREF: