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

[Alexander Motin]

Author: mav
Date: Sat Jul 12 02:33:03 2014
New Revision: 268554
URL: http://svnweb.freebsd.org/changeset/base/268554

Log:
  MFC r268392:
  Do not return statuses for aborted iSCSI commands.

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

Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Sat Jul 12 02:29:33 2014	(r268553)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Sat Jul 12 02:33:03 2014	(r268554)
@@ -2807,6 +2807,16 @@ cfiscsi_scsi_command_done(union ctl_io *
 	CFISCSI_SESSION_UNLOCK(cs);
 #endif
 
+	/*
+	 * Do not return status for aborted commands.
+	 * There are exceptions, but none supported by CTL yet.
+	 */
+	if (io->io_hdr.status == CTL_CMD_ABORTED) {
+		ctl_free_io(io);
+		icl_pdu_free(request);
+		return;
+	}
+
 	response = cfiscsi_pdu_new_response(request, M_WAITOK);
 	bhssr = (struct iscsi_bhs_scsi_response *)response->ip_bhs;
 	bhssr->bhssr_opcode = ISCSI_BHS_OPCODE_SCSI_RESPONSE;