From 9fcee8bc378dfeb8dbf2e1fdb39d03464f04641b Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 21 Sep 2021 02:31:14 +0900 Subject: [PATCH] vhost/scsi: Use spdk_scsi_dev_get_first/next_lun() to iterate LUNs. This is the same effort as lib/iscsi. By using spdk_scsi_dev_get_first_lun() and spdk_scsi_dev_get_next_lun(), remove the dependency on SPDK_SCSI_DEV_MAX_LUN from lib/vhost. Signed-off-by: Shuhei Matsumoto Change-Id: Ib79d2c3f8e7a5027d3d2c03f8f886c588b86009b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9611 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/vhost/vhost_scsi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index cba4b2490..3172265be 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -1527,7 +1527,6 @@ vhost_scsi_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_write_ct struct spdk_scsi_dev *sdev; struct spdk_scsi_lun *lun; uint32_t dev_idx; - uint32_t lun_idx; assert(vdev != NULL); spdk_json_write_named_array_begin(w, "scsi"); @@ -1547,12 +1546,8 @@ vhost_scsi_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_write_ct spdk_json_write_named_array_begin(w, "luns"); - for (lun_idx = 0; lun_idx < SPDK_SCSI_DEV_MAX_LUN; lun_idx++) { - lun = spdk_scsi_dev_get_lun(sdev, lun_idx); - if (!lun) { - continue; - } - + for (lun = spdk_scsi_dev_get_first_lun(sdev); lun != NULL; + lun = spdk_scsi_dev_get_next_lun(lun)) { spdk_json_write_object_begin(w); spdk_json_write_named_int32(w, "id", spdk_scsi_lun_get_id(lun));