From owner-p4-projects@FreeBSD.ORG  Thu Jan 21 20:02:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C63D91065692; Thu, 21 Jan 2010 20:02:58 +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 8A89F106568B
	for <perforce@freebsd.org>; Thu, 21 Jan 2010 20:02:58 +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 7728C8FC20
	for <perforce@freebsd.org>; Thu, 21 Jan 2010 20:02:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0LK2wCA000992
	for <perforce@freebsd.org>; Thu, 21 Jan 2010 20:02:58 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0LK2wmQ000990
	for perforce@freebsd.org; Thu, 21 Jan 2010 20:02:58 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 21 Jan 2010 20:02:58 GMT
Message-Id: <201001212002.o0LK2wmQ000990@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173469 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2010 20:02:59 -0000

http://p4web.freebsd.org/chv.cgi?CH=173469

Change 173469 by mav@mav_mavtest on 2010/01/21 20:02:45

	Do not return command execution status as ioctl status,
	or ioctl won't do copy-out and user-level won't get result CCB.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#30 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#30 (text+ko) ====

@@ -563,12 +563,10 @@
 	 * that request.  Otherwise, it's up to the user to perform any
 	 * error recovery.
 	 */
-	error = cam_periph_runccb(ccb,
-				  (ccb->ccb_h.flags & CAM_PASS_ERR_RECOVER) ?
-				  passerror : NULL,
-				  /* cam_flags */ CAM_RETRY_SELTO,
-				  /* sense_flags */SF_RETRY_UA,
-				  softc->device_stats);
+	cam_periph_runccb(ccb,
+	    (ccb->ccb_h.flags & CAM_PASS_ERR_RECOVER) ? passerror : NULL,
+	    /* cam_flags */ CAM_RETRY_SELTO, /* sense_flags */SF_RETRY_UA,
+	    softc->device_stats);
 
 	if (need_unmap != 0)
 		cam_periph_unmapmem(ccb, &mapinfo);
@@ -577,7 +575,7 @@
 	ccb->ccb_h.periph_priv = inccb->ccb_h.periph_priv;
 	bcopy(ccb, inccb, sizeof(union ccb));
 
-	return(error);
+	return(0);
 }
 
 static int