From owner-svn-src-head@freebsd.org Fri Apr 15 05:10:40 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91227AED5E3; Fri, 15 Apr 2016 05:10:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3860A1EE1; Fri, 15 Apr 2016 05:10:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3F5Ad8V083817; Fri, 15 Apr 2016 05:10:39 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3F5AdwY083815; Fri, 15 Apr 2016 05:10:39 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201604150510.u3F5AdwY083815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 15 Apr 2016 05:10:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298037 - in head/sys/cam: ata scsi 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.21 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, 15 Apr 2016 05:10:40 -0000 Author: imp Date: Fri Apr 15 05:10:39 2016 New Revision: 298037 URL: https://svnweb.freebsd.org/changeset/base/298037 Log: Expand CAM_IO_STATS #ifdef to logical unit. Modified: head/sys/cam/ata/ata_da.c head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/ata/ata_da.c ============================================================================== --- head/sys/cam/ata/ata_da.c Fri Apr 15 05:10:32 2016 (r298036) +++ head/sys/cam/ata/ata_da.c Fri Apr 15 05:10:39 2016 (r298037) @@ -2175,6 +2175,7 @@ out: static int adaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) { +#ifdef CAM_IO_STATS struct ada_softc *softc; struct cam_periph *periph; @@ -2183,9 +2184,7 @@ adaerror(union ccb *ccb, u_int32_t cam_f switch (ccb->ccb_h.status & CAM_STATUS_MASK) { case CAM_CMD_TIMEOUT: -#ifdef CAM_IO_STATS softc->timeouts++; -#endif break; case CAM_REQ_ABORTED: case CAM_REQ_CMP_ERR: @@ -2193,13 +2192,12 @@ adaerror(union ccb *ccb, u_int32_t cam_f case CAM_UNREC_HBA_ERROR: case CAM_DATA_RUN_ERR: case CAM_ATA_STATUS_ERROR: -#ifdef CAM_IO_STATS softc->errors++; -#endif break; default: break; } +#endif return(cam_periph_error(ccb, cam_flags, sense_flags, NULL)); } Modified: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Fri Apr 15 05:10:32 2016 (r298036) +++ head/sys/cam/scsi/scsi_da.c Fri Apr 15 05:10:39 2016 (r298037) @@ -3773,24 +3773,22 @@ daerror(union ccb *ccb, u_int32_t cam_fl if (error == ERESTART) return (ERESTART); +#ifdef CAM_IO_STATS switch (ccb->ccb_h.status & CAM_STATUS_MASK) { case CAM_CMD_TIMEOUT: -#ifdef CAM_IO_STATS softc->timeouts++; -#endif break; case CAM_REQ_ABORTED: case CAM_REQ_CMP_ERR: case CAM_REQ_TERMIO: case CAM_UNREC_HBA_ERROR: case CAM_DATA_RUN_ERR: -#ifdef CAM_IO_STATS softc->errors++; -#endif break; default: break; } +#endif /* * XXX