Author: scottl
Date: Fri Oct 16 17:56:43 2015
New Revision: 289426
URL: https://svnweb.freebsd.org/changeset/base/289426
Log:
Remove _FreeBSD_version check for something that was only an issue with
9-CURRENT.
Obtained from: Netlfix, Inc
MFC after: 3 days
Modified:
head/sys/dev/mpr/mpr.c
head/sys/dev/mpr/mprvar.h
head/sys/dev/mps/mps.c
head/sys/dev/mps/mps_sas.h
head/sys/dev/mps/mpsvar.h
Modified: head/sys/dev/mpr/mpr.c
==============================================================================
--- head/sys/dev/mpr/mpr.c Fri Oct 16 17:50:36 2015 (r289425)
+++ head/sys/dev/mpr/mpr.c Fri Oct 16 17:56:43 2015 (r289426)
@@ -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,
Modified: head/sys/dev/mpr/mprvar.h
==============================================================================
--- head/sys/dev/mpr/mprvar.h Fri Oct 16 17:50:36 2015 (r289425)
+++ head/sys/dev/mpr/mprvar.h Fri Oct 16 17:56:43 2015 (r289426)
@@ -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);
}
Modified: head/sys/dev/mps/mps.c
==============================================================================
--- head/sys/dev/mps/mps.c Fri Oct 16 17:50:36 2015 (r289425)
+++ head/sys/dev/mps/mps.c Fri Oct 16 17:56:43 2015 (r289426)
@@ -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,
Modified: head/sys/dev/mps/mps_sas.h
==============================================================================
--- head/sys/dev/mps/mps_sas.h Fri Oct 16 17:50:36 2015 (r289425)
+++ head/sys/dev/mps/mps_sas.h Fri Oct 16 17:56:43 2015 (r289426)
@@ -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;
Modified: head/sys/dev/mps/mpsvar.h
==============================================================================
--- head/sys/dev/mps/mpsvar.h Fri Oct 16 17:50:36 2015 (r289425)
+++ head/sys/dev/mps/mpsvar.h Fri Oct 16 17:56:43 2015 (r289426)
@@ -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);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
