From owner-svn-src-head@FreeBSD.ORG Fri Sep 27 16:02:41 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 79499329; Fri, 27 Sep 2013 16:02:41 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CD292AF9; Fri, 27 Sep 2013 16:02:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8RG2fPu093061; Fri, 27 Sep 2013 16:02:41 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8RG2eY8093059; Fri, 27 Sep 2013 16:02:40 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309271602.r8RG2eY8093059@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 27 Sep 2013 16:02:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255915 - head/sys/cam X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Sep 2013 16:02:41 -0000 Author: nwhitehorn Date: Fri Sep 27 16:02:40 2013 New Revision: 255915 URL: http://svnweb.freebsd.org/changeset/base/255915 Log: Make sure the CCB xflags field is initialized to zero so that CAM_EXTLUN_VALID is not erroneously set. Also add an XPORT_SRP identifier to the known SCSI transports for the SCSI RDMA protocol, as used, for example with Infiniband storage. Reviewed by: scottl Approved by: re (marius) Modified: head/sys/cam/cam_ccb.h head/sys/cam/cam_xpt.c Modified: head/sys/cam/cam_ccb.h ============================================================================== --- head/sys/cam/cam_ccb.h Fri Sep 27 15:22:08 2013 (r255914) +++ head/sys/cam/cam_ccb.h Fri Sep 27 16:02:40 2013 (r255915) @@ -262,6 +262,7 @@ typedef enum { XPORT_SAS, /* Serial Attached SCSI */ XPORT_SATA, /* Serial AT Attachment */ XPORT_ISCSI, /* iSCSI */ + XPORT_SRP, /* SCSI RDMA Protocol */ } cam_xport; #define XPORT_IS_ATA(t) ((t) == XPORT_ATA || (t) == XPORT_SATA) @@ -1233,6 +1234,7 @@ cam_fill_csio(struct ccb_scsiio *csio, u { csio->ccb_h.func_code = XPT_SCSI_IO; csio->ccb_h.flags = flags; + csio->ccb_h.xflags = 0; csio->ccb_h.retry_count = retries; csio->ccb_h.cbfcnp = cbfcnp; csio->ccb_h.timeout = timeout; @@ -1252,6 +1254,7 @@ cam_fill_ctio(struct ccb_scsiio *csio, u { csio->ccb_h.func_code = XPT_CONT_TARGET_IO; csio->ccb_h.flags = flags; + csio->ccb_h.xflags = 0; csio->ccb_h.retry_count = retries; csio->ccb_h.cbfcnp = cbfcnp; csio->ccb_h.timeout = timeout; Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Fri Sep 27 15:22:08 2013 (r255914) +++ head/sys/cam/cam_xpt.c Fri Sep 27 16:02:40 2013 (r255915) @@ -3337,6 +3337,7 @@ xpt_setup_ccb(struct ccb_hdr *ccb_h, str } ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; ccb_h->flags = 0; + ccb_h->xflags = 0; } /* Path manipulation functions */ @@ -3891,6 +3892,7 @@ xpt_bus_register(struct cam_sim *sim, de case XPORT_FC: case XPORT_USB: case XPORT_ISCSI: + case XPORT_SRP: case XPORT_PPB: new_bus->xport = scsi_get_xport(); break;