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: [PATCH 2/9] block: cleanup the !zoned case in blk_revalidate_disk_zones Date: Fri, 8 Nov 2019 10:56:55 +0900 [thread overview] Message-ID: <20191108015702.233102-3-damien.lemoal@wdc.com> (raw) In-Reply-To: <20191108015702.233102-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> --- 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
WARNING: multiple messages have this Message-ID (diff)
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 2/9] block: cleanup the !zoned case in blk_revalidate_disk_zones Date: Fri, 8 Nov 2019 10:56:55 +0900 [thread overview] Message-ID: <20191108015702.233102-3-damien.lemoal@wdc.com> (raw) In-Reply-To: <20191108015702.233102-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> --- 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-08 1:57 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-08 1:56 [PATCH 0/9] Zoned block device enhancements and zone report rework Damien Le Moal 2019-11-08 1:56 ` [f2fs-dev] " Damien Le Moal 2019-11-08 1:56 ` [PATCH 1/9] block: Enhance blk_revalidate_disk_zones() Damien Le Moal 2019-11-08 1:56 ` [f2fs-dev] " Damien Le Moal 2019-11-08 6:28 ` [dm-devel] " Christoph Hellwig 2019-11-08 6:28 ` Christoph Hellwig 2019-11-08 6:28 ` [f2fs-dev] " Christoph Hellwig 2019-11-08 7:10 ` Hannes Reinecke 2019-11-08 7:10 ` Hannes Reinecke 2019-11-08 7:10 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 1:56 ` Damien Le Moal [this message] 2019-11-08 1:56 ` [f2fs-dev] [PATCH 2/9] block: cleanup the !zoned case in blk_revalidate_disk_zones Damien Le Moal 2019-11-08 7:11 ` Hannes Reinecke 2019-11-08 7:11 ` Hannes Reinecke 2019-11-08 7:11 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 18:50 ` Chaitanya Kulkarni 2019-11-08 18:50 ` Chaitanya Kulkarni 2019-11-08 18:50 ` [f2fs-dev] " Chaitanya Kulkarni 2019-11-08 1:56 ` [PATCH 3/9] block: Simplify report zones execution Damien Le Moal 2019-11-08 1:56 ` [f2fs-dev] " Damien Le Moal 2019-11-08 7:12 ` Hannes Reinecke 2019-11-08 7:12 ` Hannes Reinecke 2019-11-08 7:12 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 1:56 ` [PATCH 4/9] block: Remove partition support for zoned block devices Damien Le Moal 2019-11-08 1:56 ` [f2fs-dev] " Damien Le Moal 2019-11-08 6:30 ` [dm-devel] " Christoph Hellwig 2019-11-08 6:30 ` Christoph Hellwig 2019-11-08 6:30 ` [f2fs-dev] " Christoph Hellwig 2019-11-08 7:17 ` Hannes Reinecke 2019-11-08 7:17 ` Hannes Reinecke 2019-11-08 7:17 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 7:28 ` Damien Le Moal 2019-11-08 7:28 ` Damien Le Moal 2019-11-08 7:28 ` [f2fs-dev] " Damien Le Moal 2019-11-08 1:56 ` [PATCH 5/9] null_blk: clean up the block device operations Damien Le Moal 2019-11-08 1:56 ` [f2fs-dev] " Damien Le Moal 2019-11-08 7:17 ` Hannes Reinecke 2019-11-08 7:17 ` Hannes Reinecke 2019-11-08 7:17 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 18:47 ` Chaitanya Kulkarni 2019-11-08 18:47 ` Chaitanya Kulkarni 2019-11-08 18:47 ` [f2fs-dev] " Chaitanya Kulkarni 2019-11-08 1:56 ` [PATCH 6/9] null_blk: clean up report zones Damien Le Moal 2019-11-08 1:56 ` [f2fs-dev] " Damien Le Moal 2019-11-08 7:18 ` Hannes Reinecke 2019-11-08 7:18 ` Hannes Reinecke 2019-11-08 7:18 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 18:47 ` Chaitanya Kulkarni 2019-11-08 18:47 ` Chaitanya Kulkarni 2019-11-08 18:47 ` [f2fs-dev] " Chaitanya Kulkarni 2019-11-08 1:57 ` [PATCH 7/9] null_blk: Add zone_nr_conv to features Damien Le Moal 2019-11-08 1:57 ` [f2fs-dev] " Damien Le Moal 2019-11-08 7:18 ` Hannes Reinecke 2019-11-08 7:18 ` Hannes Reinecke 2019-11-08 7:18 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 18:48 ` Chaitanya Kulkarni 2019-11-08 18:48 ` Chaitanya Kulkarni 2019-11-08 18:48 ` [f2fs-dev] " Chaitanya Kulkarni 2019-11-08 1:57 ` [PATCH 8/9] scsi: sd_zbc: Cleanup sd_zbc_alloc_report_buffer() Damien Le Moal 2019-11-08 1:57 ` [f2fs-dev] " Damien Le Moal 2019-11-08 6:31 ` [dm-devel] " Christoph Hellwig 2019-11-08 6:31 ` Christoph Hellwig 2019-11-08 6:31 ` [f2fs-dev] " Christoph Hellwig 2019-11-08 7:20 ` Hannes Reinecke 2019-11-08 7:20 ` Hannes Reinecke 2019-11-08 7:20 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 19:06 ` [dm-devel] " Bart Van Assche 2019-11-08 19:06 ` [f2fs-dev] " Bart Van Assche 2019-11-09 2:54 ` Damien Le Moal 2019-11-09 2:54 ` Damien Le Moal 2019-11-09 2:54 ` [f2fs-dev] " Damien Le Moal 2019-11-09 3:02 ` Bart Van Assche 2019-11-09 3:02 ` Bart Van Assche 2019-11-09 3:02 ` [f2fs-dev] " Bart Van Assche 2019-11-08 1:57 ` [PATCH 9/9] block: rework zone reporting Damien Le Moal 2019-11-08 1:57 ` [f2fs-dev] " Damien Le Moal 2019-11-08 7:23 ` Hannes Reinecke 2019-11-08 7:23 ` Hannes Reinecke 2019-11-08 7:23 ` [f2fs-dev] " Hannes Reinecke 2019-11-08 15:16 ` Mike Snitzer 2019-11-08 15:16 ` Mike Snitzer 2019-11-08 15:16 ` [f2fs-dev] " Mike Snitzer
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=20191108015702.233102-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.