svn commit: r275200 - stable/10/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Fri Nov 28 08:52:38 2014
New Revision: 275200
URL: https://svnweb.freebsd.org/changeset/base/275200

Log:
  MFC r274786: Log errors for absent LUNs too.

Modified:
  stable/10/sys/cam/ctl/ctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Fri Nov 28 04:07:06 2014	(r275199)
+++ stable/10/sys/cam/ctl/ctl.c	Fri Nov 28 08:52:38 2014	(r275200)
@@ -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);
 }