Commit 0fd9bba2 authored by Jim Harris's avatar Jim Harris
Browse files

scsi: use lun instead of its name as spdk_scsi_lun_delete param 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I7cf52d4d27ee3433da94a034ef320ad811ca6758

Reviewed-on: https://review.gerrithub.io/390842


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatar <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent 759e5934

lib/scsi/lun.c

+2 −9
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ spdk_scsi_lun_hotplug(void *arg) 


	if (!spdk_scsi_lun_has_pending_tasks(lun)) {

		spdk_scsi_lun_free_io_channel(lun);

		spdk_scsi_lun_delete(lun->name);

		spdk_scsi_lun_delete(lun);

	}

}
@@ -339,18 +339,11 @@ spdk_scsi_lun_destruct(struct spdk_scsi_lun *lun) 
}



int

spdk_scsi_lun_delete(const char *lun_name)

spdk_scsi_lun_delete(struct spdk_scsi_lun *lun)

{

	struct spdk_scsi_lun *lun;

	struct spdk_scsi_dev *dev;



	pthread_mutex_lock(&g_spdk_scsi.mutex);

	lun = spdk_lun_db_get_lun(lun_name);

	if (lun == NULL) {

		SPDK_ERRLOG("LUN '%s' not found\n", lun_name);

		pthread_mutex_unlock(&g_spdk_scsi.mutex);

		return -1;

	}



	dev = lun->dev;

lib/scsi/scsi_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void spdk_scsi_lun_execute_tasks(struct spdk_scsi_lun *lun); 
int spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task, enum spdk_scsi_task_func func);

void spdk_scsi_lun_complete_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task);

void spdk_scsi_lun_complete_mgmt_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task);

int spdk_scsi_lun_delete(const char *lun_name);

int spdk_scsi_lun_delete(struct spdk_scsi_lun *lun);

int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun);

void spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun *lun);

bool spdk_scsi_lun_has_pending_tasks(const struct spdk_scsi_lun *lun);

test/unit/lib/scsi/lun.c/lun_ut.c

+1 −9
Original line number Diff line number Diff line
@@ -654,16 +654,8 @@ lun_delete(void) 


	lun = lun_construct();



	rc = spdk_scsi_lun_delete(lun->name);

	rc = spdk_scsi_lun_delete(lun);

	CU_ASSERT_EQUAL(rc, 0);



	lun = lun_construct();



	rc = spdk_scsi_lun_delete(lun->name);

	CU_ASSERT_EQUAL(rc, 0);



	rc = spdk_scsi_lun_delete("test");

	CU_ASSERT_EQUAL(rc, -1);

}



int