From: Damien Le Moal <damien.lemoal@wdc.com>
To: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
dm-devel@redhat.com, Mike Snitzer <snitzer@redhat.com>,
linux-f2fs-devel@lists.sourceforge.net,
Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <yuchao0@huawei.com>
Subject: [f2fs-dev] [PATCH v2 2/9] block: cleanup the !zoned case in blk_revalidate_disk_zones
Date: Mon, 11 Nov 2019 11:39:23 +0900 [thread overview]
Message-ID: <20191111023930.638129-3-damien.lemoal@wdc.com> (raw)
In-Reply-To: <20191111023930.638129-1-damien.lemoal@wdc.com>
From: Christoph Hellwig <hch@lst.de>
blk_revalidate_disk_zones is never called for non-zoned devices. Just
return early and warn instead of trying to handle this case.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
block/blk-zoned.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index dae787f67019..523a28d7a15c 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -520,6 +520,9 @@ int blk_revalidate_disk_zones(struct gendisk *disk)
sector_t sector = 0;
int ret = 0;
+ if (WARN_ON_ONCE(!blk_queue_is_zoned(q)))
+ return -EIO;
+
/*
* BIO based queues do not use a scheduler so only q->nr_zones
* needs to be updated so that the sysfs exposed value is correct.
@@ -535,10 +538,8 @@ int blk_revalidate_disk_zones(struct gendisk *disk)
*/
noio_flag = memalloc_noio_save();
- if (!blk_queue_is_zoned(q) || !nr_zones) {
- nr_zones = 0;
+ if (!nr_zones)
goto update;
- }
/* Allocate bitmaps */
ret = -ENOMEM;
--
2.23.0
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2019-11-11 2:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 2:39 [f2fs-dev] [PATCH v2 0/9] Zoned block device enhancements and zone report rework Damien Le Moal
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 1/9] block: Enhance blk_revalidate_disk_zones() Damien Le Moal
2019-11-11 2:39 ` Damien Le Moal [this message]
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 3/9] block: Simplify report zones execution Damien Le Moal
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 4/9] block: Remove partition support for zoned block devices Damien Le Moal
2019-11-11 6:55 ` Hannes Reinecke
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 5/9] null_blk: clean up the block device operations Damien Le Moal
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 6/9] null_blk: clean up report zones Damien Le Moal
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 7/9] null_blk: Add zone_nr_conv to features Damien Le Moal
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 8/9] scsi: sd_zbc: Cleanup sd_zbc_alloc_report_buffer() Damien Le Moal
2019-11-11 6:56 ` Hannes Reinecke
2019-11-11 10:22 ` Christoph Hellwig
2019-11-13 1:46 ` Martin K. Petersen
2019-11-11 2:39 ` [f2fs-dev] [PATCH v2 9/9] block: rework zone reporting Damien Le Moal
2019-11-13 2:16 ` [f2fs-dev] [PATCH v2 0/9] Zoned block device enhancements and zone report rework Jens Axboe
2019-11-13 2:40 ` Damien Le Moal
2019-11-13 7:06 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191111023930.638129-3-damien.lemoal@wdc.com \
--to=damien.lemoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=jaegeuk@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=snitzer@redhat.com \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).