svn commit: r255117 - head/sys/cam/ctl
Alexander Motin
mav at FreeBSD.org
Sun Sep 1 10:11:01 UTC 2013
Author: mav
Date: Sun Sep 1 10:11:00 2013
New Revision: 255117
URL: http://svnweb.freebsd.org/changeset/base/255117
Log:
Fix the build with CTLFEDEBUG, broken by unmapped I/O support changes.
Modified:
head/sys/cam/ctl/scsi_ctl.c
Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c Sun Sep 1 09:10:15 2013 (r255116)
+++ head/sys/cam/ctl/scsi_ctl.c Sun Sep 1 10:11:00 2013 (r255117)
@@ -961,23 +961,23 @@ ctlfestart(struct cam_periph *periph, un
/*
* Valid combinations:
- * - CAM_SEND_STATUS, SCATTER_VALID = 0, dxfer_len = 0,
+ * - CAM_SEND_STATUS, CAM_DATA_SG = 0, dxfer_len = 0,
* sglist_cnt = 0
- * - CAM_SEND_STATUS = 0, SCATTER_VALID = 0, dxfer_len != 0,
+ * - CAM_SEND_STATUS = 0, CAM_DATA_SG = 0, dxfer_len != 0,
* sglist_cnt = 0
- * - CAM_SEND_STATUS = 0, SCATTER_VALID, dxfer_len != 0,
+ * - CAM_SEND_STATUS = 0, CAM_DATA_SG, dxfer_len != 0,
* sglist_cnt != 0
*/
#ifdef CTLFEDEBUG
if (((flags & CAM_SEND_STATUS)
- && (((flags & CAM_SCATTER_VALID) != 0)
+ && (((flags & CAM_DATA_SG) != 0)
|| (dxfer_len != 0)
|| (csio->sglist_cnt != 0)))
|| (((flags & CAM_SEND_STATUS) == 0)
&& (dxfer_len == 0))
- || ((flags & CAM_SCATTER_VALID)
+ || ((flags & CAM_DATA_SG)
&& (csio->sglist_cnt == 0))
- || (((flags & CAM_SCATTER_VALID) == 0)
+ || (((flags & CAM_DATA_SG) == 0)
&& (csio->sglist_cnt != 0))) {
printf("%s: tag %04x cdb %02x flags %#x dxfer_len "
"%d sg %u\n", __func__, atio->tag_id,
More information about the svn-src-head
mailing list