From fa2cd143bf381b06f86cce62f16dfa97f387c20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 16 Aug 2017 21:21:38 +0200 Subject: vhost-user-scsi: assert() in iscsi_add_lun() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of a preliminary check, add an assert to the function that has the pre-condition. Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé --- contrib/vhost-user-scsi/vhost-user-scsi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index dd0de1fc89..0573ae794e 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -257,6 +257,7 @@ static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri) assert(lun); assert(iscsi_uri); + assert(!lun->iscsi_ctx); iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR); if (!iscsi_ctx) { @@ -663,11 +664,6 @@ static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi, assert(iscsi_uri); assert(lun < VUS_MAX_LUNS); - if (vdev_scsi->luns[lun].iscsi_ctx) { - PERR("Lun %d already configured", lun); - return -1; - } - if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) != 0) { return -1; } -- cgit v1.2.1