diff options
| author | imp <imp@FreeBSD.org> | 2016-04-15 05:10:39 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2016-04-15 05:10:39 +0000 |
| commit | 23ff5a15d9c9ebde0c14e70421b2eca81b3fbcce (patch) | |
| tree | 69f7e9ccac0e3746266a955e3e5b5f0574a67eae /sys/cam | |
| parent | 28a38a14ee9b2ba31fe760e3903519a416ec7a5a (diff) | |
| download | FreeBSD-src-23ff5a15d9c9ebde0c14e70421b2eca81b3fbcce.zip FreeBSD-src-23ff5a15d9c9ebde0c14e70421b2eca81b3fbcce.tar.gz | |
Expand CAM_IO_STATS #ifdef to logical unit.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ata/ata_da.c | 6 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index a2025ef..05134d7 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -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_flags, u_int32_t sense_flags) 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_flags, u_int32_t sense_flags) 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)); } diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 8299c06..d97e99d 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -3773,24 +3773,22 @@ daerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) 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 |
