From owner-p4-projects@FreeBSD.ORG Sun Jun 14 21:08:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 469D910656CA; Sun, 14 Jun 2009 21:08:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 050E710656C8 for ; Sun, 14 Jun 2009 21:08:56 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E75D68FC24 for ; Sun, 14 Jun 2009 21:08:55 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5EL8t96089560 for ; Sun, 14 Jun 2009 21:08:55 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5EL8tJf089558 for perforce@freebsd.org; Sun, 14 Jun 2009 21:08:55 GMT (envelope-from mav@freebsd.org) Date: Sun, 14 Jun 2009 21:08:55 GMT Message-Id: <200906142108.n5EL8tJf089558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 164379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2009 21:08:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=164379 Change 164379 by mav@mav_mavbook on 2009/06/14 21:08:23 Remove some SCSI legacy. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#9 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#22 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#9 (text+ko) ==== @@ -857,14 +857,8 @@ bp = (struct bio *)done_ccb->ccb_h.ccb_bp; if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { int error; - int sf; - if ((ataio->ccb_h.ccb_state & DA_CCB_RETRY_UA) != 0) - sf = SF_RETRY_UA; - else - sf = 0; - - error = daerror(done_ccb, CAM_RETRY_SELTO, sf); + error = daerror(done_ccb, CAM_RETRY_SELTO, 0); if (error == ERESTART) { /* * A retry was scheuled, so @@ -953,12 +947,6 @@ periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct da_softc *)periph->softc; - /* - * XXX - * Until we have a better way of doing pack validation, - * don't treat UAs as errors. - */ - sense_flags |= SF_RETRY_UA; return(cam_periph_error(ccb, cam_flags, sense_flags, &softc->saved_ccb)); } ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#22 (text+ko) ==== @@ -684,10 +684,7 @@ xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -783,10 +780,7 @@ xpt_schedule(periph, priority); return; } - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -859,10 +853,7 @@ xpt_release_ccb(done_ccb); break; } - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -887,10 +878,7 @@ xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -912,10 +900,7 @@ xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -950,10 +935,7 @@ xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -978,10 +960,7 @@ xpt_schedule(periph, priority); return; } - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -1006,10 +985,7 @@ xpt_schedule(periph, priority); return; } - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -1049,10 +1025,7 @@ xpt_schedule(periph, priority); return; } - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -1079,10 +1052,7 @@ xpt_release_ccb(done_ccb); } break; - } else if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 - ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, + } else if (cam_periph_error(done_ccb, 0, 0, &softc->saved_ccb) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {