Date: Fri, 24 May 2013 06:13:36 +0000 (UTC) From: Scott Long <scottl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r250961 - stable/9/sys/cam Message-ID: <201305240613.r4O6Dade074087@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scottl Date: Fri May 24 06:13:36 2013 New Revision: 250961 URL: http://svnweb.freebsd.org/changeset/base/250961 Log: Revert r250948, it was merged too soon. Modified: stable/9/sys/cam/cam_periph.c Modified: stable/9/sys/cam/cam_periph.c ============================================================================== --- stable/9/sys/cam/cam_periph.c Fri May 24 04:03:04 2013 (r250960) +++ stable/9/sys/cam/cam_periph.c Fri May 24 06:13:36 2013 (r250961) @@ -733,8 +733,6 @@ cam_periph_mapmem(union ccb *ccb, struct case XPT_CONT_TARGET_IO: if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_NONE) return(0); - KASSERT((ccb->ccb_h.flags & CAM_DATA_MASK) == CAM_DATA_VADDR, - ("not VADDR for SCSI_IO %p %x\n", ccb, ccb->ccb_h.flags)); data_ptrs[0] = &ccb->csio.data_ptr; lengths[0] = ccb->csio.dxfer_len; @@ -744,8 +742,6 @@ cam_periph_mapmem(union ccb *ccb, struct case XPT_ATA_IO: if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_NONE) return(0); - KASSERT((ccb->ccb_h.flags & CAM_DATA_MASK) == CAM_DATA_VADDR, - ("not VADDR for ATA_IO %p %x\n", ccb, ccb->ccb_h.flags)); data_ptrs[0] = &ccb->ataio.data_ptr; lengths[0] = ccb->ataio.dxfer_len;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305240613.r4O6Dade074087>