From owner-freebsd-bugs@FreeBSD.ORG  Thu Dec  2 18:40:09 2010
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AF231065670
	for <freebsd-bugs@hub.freebsd.org>;
	Thu,  2 Dec 2010 18:40:09 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F8678FC12
	for <freebsd-bugs@hub.freebsd.org>;
	Thu,  2 Dec 2010 18:40:09 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oB2Ie9Dk031582
	for <freebsd-bugs@freefall.freebsd.org>; Thu, 2 Dec 2010 18:40:09 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oB2Ie9Qu031581;
	Thu, 2 Dec 2010 18:40:09 GMT (envelope-from gnats)
Date: Thu, 2 Dec 2010 18:40:09 GMT
Message-Id: <201012021840.oB2Ie9Qu031581@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: John Baldwin <jhb@freebsd.org>
Cc: 
Subject: Re: kern/152768: [mfi] Weird check in mfi(4)
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: John Baldwin <jhb@freebsd.org>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Dec 2010 18:40:09 -0000

The following reply was made to PR kern/152768; it has been noted by GNATS.

From: John Baldwin <jhb@freebsd.org>
To: bug-followup@freebsd.org,
 saw@online.de
Cc: scottl@freebsd.org
Subject: Re: kern/152768: [mfi] Weird check in mfi(4)
Date: Thu, 2 Dec 2010 13:30:51 -0500

 I think it should be 'ccb->csio.data_ptr[0] & 0xe0 | T_NODEVICE', or even 
 shorter would be to do this:
 
 Index: mfi_cam.c
 ===================================================================
 --- mfi_cam.c	(revision 216122)
 +++ mfi_cam.c	(working copy)
 @@ -340,14 +340,14 @@
  		ccbh->status = CAM_REQ_CMP;
  		csio->scsi_status = pt->header.scsi_status;
  		if (ccbh->flags & CAM_CDB_POINTER)
 -			command = ccb->csio.cdb_io.cdb_ptr[0];
 +			command = csio->cdb_io.cdb_ptr[0];
  		else
 -			command = ccb->csio.cdb_io.cdb_bytes[0];
 +			command = csio->cdb_io.cdb_bytes[0];
  		if (command == INQUIRY) {
 -			device = ccb->csio.data_ptr[0] & 0x1f;
 +			device = csio->data_ptr[0] & 0x1f;
  			if ((device == T_DIRECT) || (device == T_PROCESSOR))
  				csio->data_ptr[0] =
 -				     (device & 0xe0) | T_NODEVICE;
 +				     (csio->data_ptr[0] & 0xe0) | T_NODEVICE;
  		}
  		break;
  	}
 
 The intention from the code seems to be to mask T_DIRECT and T_PROCESSOR
 devices by mapping them to T_NODEVICE instead.
 
 -- 
 John Baldwin