summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-11-28 08:52:38 +0000
committermav <mav@FreeBSD.org>2014-11-28 08:52:38 +0000
commit6f5634bed9883003fa2bf50b5ec5282a7c1abc80 (patch)
tree95ea8c0d3024ab06875a690ff16f814bc1e1149e /sys
parent43998423fbe7d170840667d77d51e1b3b5e0d7d7 (diff)
downloadFreeBSD-src-6f5634bed9883003fa2bf50b5ec5282a7c1abc80.zip
FreeBSD-src-6f5634bed9883003fa2bf50b5ec5282a7c1abc80.tar.gz
MFC r274786: Log errors for absent LUNs too.
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/ctl/ctl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 3a1c9ae..095d4eb 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -13681,7 +13681,7 @@ static int
ctl_process_done(union ctl_io *io)
{
struct ctl_lun *lun;
- struct ctl_softc *ctl_softc;
+ struct ctl_softc *ctl_softc = control_softc;
void (*fe_done)(union ctl_io *io);
uint32_t targ_port = ctl_port_idx(io->io_hdr.nexus.targ_port);
@@ -13747,10 +13747,8 @@ ctl_process_done(union ctl_io *io)
if (lun == NULL) {
CTL_DEBUG_PRINT(("NULL LUN for lun %d\n",
io->io_hdr.nexus.targ_mapped_lun));
- fe_done(io);
goto bailout;
}
- ctl_softc = lun->ctl_softc;
mtx_lock(&lun->lun_lock);
@@ -13822,6 +13820,8 @@ ctl_process_done(union ctl_io *io)
} else
mtx_unlock(&lun->lun_lock);
+bailout:
+
/*
* If this command has been aborted, make sure we set the status
* properly. The FETD is responsible for freeing the I/O and doing
@@ -13904,8 +13904,6 @@ ctl_process_done(union ctl_io *io)
} else
fe_done(io);
-bailout:
-
return (CTL_RETVAL_COMPLETE);
}
OpenPOWER on IntegriCloud