dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone()
authorBob Liu <bob.liu@oracle.com>
Tue, 24 Mar 2020 13:22:45 +0000 (21:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Apr 2020 06:00:49 +0000 (08:00 +0200)
[ Upstream commit b8fdd090376a7a46d17db316638fe54b965c2fb0 ]

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 <bob.liu@oracle.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/dm-zoned-metadata.c

index e3b67b145027bf79000d3e772f3f8e4525c057dc..4d658a0c602587358caca34268f04eb990754227 100644 (file)
@@ -1105,7 +1105,6 @@ static int dmz_init_zone(struct dmz_metadata *zmd, struct dm_zone *zone,
 
        if (blkz->type == BLK_ZONE_TYPE_CONVENTIONAL) {
                set_bit(DMZ_RND, &zone->flags);
-               zmd->nr_rnd_zones++;
        } else if (blkz->type == BLK_ZONE_TYPE_SEQWRITE_REQ ||
                   blkz->type == BLK_ZONE_TYPE_SEQWRITE_PREF) {
                set_bit(DMZ_SEQ, &zone->flags);