From 8215c0acef5939323875eef64acdffbe165a27a8 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 21 Sep 2021 02:20:08 +0900 Subject: [PATCH] scsi: spdk_scsi_dev_add_lun() checks if lun_id is less than max by itself This is an effort to remove the dependency on the macro constant SPDK_SCSI_DEV_MAX_LUN from lib/iscsi. Signed-off-by: Shuhei Matsumoto Change-Id: Ieeff4136b16cc6bfa92614248f150bc9dfe3dc74 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9609 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: GangCao --- lib/iscsi/tgt_node.c | 4 ++-- lib/scsi/dev.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 00054dbee..73960d162 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -1283,8 +1283,8 @@ iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target, return -1; } - if (lun_id < -1 || lun_id >= SPDK_SCSI_DEV_MAX_LUN) { - SPDK_ERRLOG("Specified LUN ID (%d) is invalid\n", lun_id); + if (lun_id < -1) { + SPDK_ERRLOG("Specified LUN ID (%d) is negative\n", lun_id); return -1; } diff --git a/lib/scsi/dev.c b/lib/scsi/dev.c index cc4248188..928accb08 100644 --- a/lib/scsi/dev.c +++ b/lib/scsi/dev.c @@ -153,6 +153,11 @@ spdk_scsi_dev_add_lun_ext(struct spdk_scsi_dev *dev, const char *bdev_name, int { struct spdk_scsi_lun *lun; + if (lun_id >= SPDK_SCSI_DEV_MAX_LUN) { + SPDK_ERRLOG("LUN ID %d is more than the maximum.\n", lun_id); + return -1; + } + /* Search the lowest free LUN ID if LUN ID is default */ if (lun_id == -1) { lun_id = scsi_dev_find_lowest_free_lun_id(dev);