If there is no corresponding scsi_device for a LUN,
tcm_loop_port_unlink() complains that it "Unable to locate struct
scsi_device for " the device and keep %tl_tpg_port_count as is. However,
such situation is legal when we delete a SCSI device using
/sys/class/scsi_device/${lun}/device/delete. We can safely ignore the
missing SCSI device case here.

Signed-off-by: Naohiro Aota <naohiro.a...@wdc.com>
---
 drivers/target/loopback/tcm_loop.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/target/loopback/tcm_loop.c 
b/drivers/target/loopback/tcm_loop.c
index 3305b47fdf53..0942f3bd7eec 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -654,16 +654,16 @@ static void tcm_loop_port_unlink(
 
        sd = scsi_device_lookup(tl_hba->sh, 0, tl_tpg->tl_tpgt,
                                se_lun->unpacked_lun);
-       if (!sd) {
-               pr_err("Unable to locate struct scsi_device for %d:%d:%llu\n",
-                      0, tl_tpg->tl_tpgt, se_lun->unpacked_lun);
-               return;
+       if (sd) {
+               /*
+                * Remove Linux/SCSI struct scsi_device by HCTL
+                */
+               scsi_remove_device(sd);
+               scsi_device_put(sd);
+       } else {
+               pr_debug("Unable to locate struct scsi_device for %d:%d:%llu\n",
+                        0, tl_tpg->tl_tpgt, se_lun->unpacked_lun);
        }
-       /*
-        * Remove Linux/SCSI struct scsi_device by HCTL
-        */
-       scsi_remove_device(sd);
-       scsi_device_put(sd);
 
        atomic_dec_mb(&tl_tpg->tl_tpg_port_count);
 
-- 
2.23.0

Reply via email to