| From 9465d1f843697b47647576ac6e3f3c7586522409 Mon Sep 17 00:00:00 2001 |
| From: Bob Liu <bob.liu@oracle.com> |
| Date: Tue, 24 Mar 2020 21:22:45 +0800 |
| Subject: [PATCH] dm zoned: remove duplicate nr_rnd_zones increase in |
| dmz_init_zone() |
| |
| 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 <bob.liu@oracle.com> |
| Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com> |
| Signed-off-by: Mike Snitzer <snitzer@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c |
| index 086a870087cf..53eb21343b11 100644 |
| --- a/drivers/md/dm-zoned-metadata.c |
| +++ b/drivers/md/dm-zoned-metadata.c |
| @@ -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); |
| -- |
| 2.7.4 |
| |
