From a34248d38f2edf09a44af1ae1501c9c6baef6346 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 9 Sep 2019 12:25:48 -0700 Subject: [PATCH] Revert "scsi: Fix seg.fault due to the gap between IO channel put and LUN removal" This reverts commit 8f33ac020dfd582154016e38bfb78a298be06def. Causing build pool failures Change-Id: Ib0dd2be4c327d76f67a00aec8a7c26f25bbaeb10 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467873 Reviewed-by: Paul Luse Reviewed-by: Shuhei Matsumoto Reviewed-by: Mike Carlin Tested-by: SPDK CI Jenkins --- lib/scsi/dev.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/scsi/dev.c b/lib/scsi/dev.c index 6171c849e..e567b4033 100644 --- a/lib/scsi/dev.c +++ b/lib/scsi/dev.c @@ -411,19 +411,11 @@ spdk_scsi_dev_get_id(const struct spdk_scsi_dev *dev) struct spdk_scsi_lun * spdk_scsi_dev_get_lun(struct spdk_scsi_dev *dev, int lun_id) { - struct spdk_scsi_lun *lun; - if (lun_id < 0 || lun_id >= SPDK_SCSI_DEV_MAX_LUN) { return NULL; } - lun = dev->lun[lun_id]; - - if (lun != NULL && !spdk_scsi_lun_is_removing(lun)) { - return lun; - } else { - return NULL; - } + return dev->lun[lun_id]; } bool