Skip to content

Commit 9f5d170

Browse files
committed
Merge branch 'for-6.19/block' into for-next
* for-6.19/block: block: don't return 1 for the fallback case in blkdev_get_zone_info
2 parents 7f50856 + 86a9ce2 commit 9f5d170

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

block/blk-zoned.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,8 +895,14 @@ static int blkdev_report_zone_fallback(struct block_device *bdev,
895895
.data = zone,
896896
.report_active = true,
897897
};
898+
int error;
898899

899-
return blkdev_do_report_zones(bdev, sector, 1, &args);
900+
error = blkdev_do_report_zones(bdev, sector, 1, &args);
901+
if (error < 0)
902+
return error;
903+
if (error == 0)
904+
return -EIO;
905+
return 0;
900906
}
901907

902908
/*

0 commit comments

Comments
 (0)