svn commit: r274786 - head/sys/cam/ctl
Alexander Motin
mav at FreeBSD.org
Fri Nov 21 08:24:38 UTC 2014
Author: mav
Date: Fri Nov 21 08:24:37 2014
New Revision: 274786
URL: https://svnweb.freebsd.org/changeset/base/274786
Log:
Log errors for absent LUNs too.
MFC after: 1 week
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c Fri Nov 21 06:27:37 2014 (r274785)
+++ head/sys/cam/ctl/ctl.c Fri Nov 21 08:24:37 2014 (r274786)
@@ -13710,7 +13710,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);
@@ -13776,10 +13776,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);
@@ -13851,6 +13849,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
@@ -13933,8 +13933,6 @@ ctl_process_done(union ctl_io *io)
} else
fe_done(io);
-bailout:
-
return (CTL_RETVAL_COMPLETE);
}
More information about the svn-src-head
mailing list