ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: no check lun->dev in spdk_scsi_lun_deletable (#82)

Browse Source 
We don't need check lun->dev in spdk_scsi_lun_deletable.
Whichever dev is null or not null, spdk_scsi_lun_delete works
appropriately.
This commit is contained in:
Tsuyoshi Uchida 2016-12-08 17:41:03 -08:00 committed by Daniel Verkamp
parent 8fac961254
commit 3560b00f20
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/scsi/lun.c
View File

@ -356,11 +356,6 @@ spdk_scsi_lun_deletable(const char *name)
goto out; goto out;
} }
if (lun->dev == NULL) {
ret = 0;
goto out;
}
out: out:
pthread_mutex_unlock(&g_spdk_scsi.mutex); pthread_mutex_unlock(&g_spdk_scsi.mutex);
return ret; return ret;

16
test/lib/scsi/lun/lun_ut.c
View File

@ -637,6 +637,21 @@ lun_construct_success(void)
CU_ASSERT_EQUAL(g_task_count, 0); CU_ASSERT_EQUAL(g_task_count, 0);
} }
static void
lun_deletable(void)
{
struct spdk_scsi_lun *lun;
int rc;
lun = lun_construct();
rc = spdk_scsi_lun_deletable(lun->name);
CU_ASSERT_EQUAL(rc, 0);
lun_destruct(lun);
rc = spdk_scsi_lun_deletable("test");
CU_ASSERT_EQUAL(rc, -1);
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@ -686,6 +701,7 @@ main(int argc, char **argv)
|| CU_add_test(suite, "destruct task - success", lun_destruct_success) == NULL || CU_add_test(suite, "destruct task - success", lun_destruct_success) == NULL
|| CU_add_test(suite, "construct - null ctx", lun_construct_null_ctx) == NULL || CU_add_test(suite, "construct - null ctx", lun_construct_null_ctx) == NULL
|| CU_add_test(suite, "construct - success", lun_construct_success) == NULL || CU_add_test(suite, "construct - success", lun_construct_success) == NULL
|| CU_add_test(suite, "deletable", lun_deletable) == NULL
) { ) {
CU_cleanup_registry(); CU_cleanup_registry();
return CU_get_error(); return CU_get_error();