[PATCH v2 3/3] repair: use cached report zone

[Damien Le Moal <dlemoal@kernel.org>]

Use BLKREPORTZONEV2 ioctl with the BLK_ZONE_REP_CACHED flag set to
speed up zone reports. If this fails, fallback to the legacy
BLKREPORTZONE ioctl() which is slower as it uses the device to get the
zone report.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 repair/zoned.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/repair/zoned.c b/repair/zoned.c
index 206b0158f95f..1e4891c483ee 100644
--- a/repair/zoned.c
+++ b/repair/zoned.c
@@ -82,8 +82,13 @@ check_zones(
 		memset(rep, 0, rep_size);
 		rep->sector = sector;
 		rep->nr_zones = ZONES_PER_IOCTL;
+		rep->flags = BLK_ZONE_REP_CACHED;
 
-		ret = ioctl(fd, BLKREPORTZONE, rep);
+		ret = ioctl(fd, BLKREPORTZONEV2, rep);
+		if (ret < 0 && errno == ENOTTY) {
+			rep->flags = 0;
+			ret = ioctl(fd, BLKREPORTZONE, rep);
+		}
 		if (ret) {
 			do_error(_("ioctl(BLKREPORTZONE) failed: %d!\n"), ret);
 			goto out_free;
-- 
2.52.0