diff options
| author | scottl <scottl@FreeBSD.org> | 2015-10-16 17:56:43 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2015-10-16 17:56:43 +0000 |
| commit | dfffba1e9869f54427035292cfa8093ad6156747 (patch) | |
| tree | ac4f4865d226c82714039ef271983a64f1d9413f | |
| parent | c010511ad0603785af0d2aa799f3086742984702 (diff) | |
| download | FreeBSD-src-dfffba1e9869f54427035292cfa8093ad6156747.zip FreeBSD-src-dfffba1e9869f54427035292cfa8093ad6156747.tar.gz | |
Remove _FreeBSD_version check for something that was only an issue with
9-CURRENT.
Obtained from: Netlfix, Inc
MFC after: 3 days
| -rw-r--r-- | sys/dev/mpr/mpr.c | 2 | ||||
| -rw-r--r-- | sys/dev/mpr/mprvar.h | 7 | ||||
| -rw-r--r-- | sys/dev/mps/mps.c | 2 | ||||
| -rw-r--r-- | sys/dev/mps/mps_sas.h | 1 | ||||
| -rw-r--r-- | sys/dev/mps/mpsvar.h | 7 |
5 files changed, 2 insertions, 17 deletions
diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index 07e73c5..ea8249b 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -1471,11 +1471,9 @@ mpr_setup_sysctl(struct mpr_softc *sc) OID_AUTO, "enable_ssu", CTLFLAG_RW, &sc->enable_ssu, 0, "enable SSU to SATA SSD/HDD at shutdown"); -#if __FreeBSD_version >= 900030 SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "chain_alloc_fail", CTLFLAG_RD, &sc->chain_alloc_fail, "chain allocation failures"); -#endif //FreeBSD_version >= 900030 SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "spinup_wait_time", CTLFLAG_RD, diff --git a/sys/dev/mpr/mprvar.h b/sys/dev/mpr/mprvar.h index acac44c..306324b 100644 --- a/sys/dev/mpr/mprvar.h +++ b/sys/dev/mpr/mprvar.h @@ -265,9 +265,7 @@ struct mpr_softc { int chain_free_lowwater; u_int enable_ssu; int spinup_wait_time; -#if __FreeBSD_version >= 900030 uint64_t chain_alloc_fail; -#endif struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; char fw_version[16]; @@ -451,11 +449,8 @@ mpr_alloc_chain(struct mpr_softc *sc) sc->chain_free--; if (sc->chain_free < sc->chain_free_lowwater) sc->chain_free_lowwater = sc->chain_free; - } -#if __FreeBSD_version >= 900030 - else + } else sc->chain_alloc_fail++; -#endif return (chain); } diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index 7f73162..4080fc6 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -1468,11 +1468,9 @@ mps_setup_sysctl(struct mps_softc *sc) OID_AUTO, "enable_ssu", CTLFLAG_RW, &sc->enable_ssu, 0, "enable SSU to SATA SSD/HDD at shutdown"); -#if __FreeBSD_version >= 900030 SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "chain_alloc_fail", CTLFLAG_RD, &sc->chain_alloc_fail, "chain allocation failures"); -#endif //FreeBSD_version >= 900030 SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "spinup_wait_time", CTLFLAG_RD, diff --git a/sys/dev/mps/mps_sas.h b/sys/dev/mps/mps_sas.h index d03258d..8255745 100644 --- a/sys/dev/mps/mps_sas.h +++ b/sys/dev/mps/mps_sas.h @@ -58,7 +58,6 @@ struct mpssas_target { uint16_t tid; SLIST_HEAD(, mpssas_lun) luns; - TAILQ_HEAD(, mps_command) commands; struct mps_command *tm; TAILQ_HEAD(, mps_command) timedout_commands; uint16_t exp_dev_handle; diff --git a/sys/dev/mps/mpsvar.h b/sys/dev/mps/mpsvar.h index 7a43e62..96bb4e1 100644 --- a/sys/dev/mps/mpsvar.h +++ b/sys/dev/mps/mpsvar.h @@ -283,9 +283,7 @@ struct mps_softc { int chain_free_lowwater; u_int enable_ssu; int spinup_wait_time; -#if __FreeBSD_version >= 900030 uint64_t chain_alloc_fail; -#endif struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; char fw_version[16]; @@ -483,11 +481,8 @@ mps_alloc_chain(struct mps_softc *sc) sc->chain_free--; if (sc->chain_free < sc->chain_free_lowwater) sc->chain_free_lowwater = sc->chain_free; - } -#if __FreeBSD_version >= 900030 - else + } else sc->chain_alloc_fail++; -#endif return (chain); } |
