diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-06-27 22:05:21 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-06-27 22:05:21 +0000 |
| commit | 37a107a407cdb47ee0f4c4337e369e9973b34076 (patch) | |
| tree | fce5301b062a855bc68b9cb76c6b5966c5a2acbe /sys/geom/shsec/g_shsec.c | |
| parent | d2f1b8f4d2975ca1ec3e7519f9d755af40f357e0 (diff) | |
| download | src-37a107a407cdb47ee0f4c4337e369e9973b34076.tar.gz src-37a107a407cdb47ee0f4c4337e369e9973b34076.zip | |
Revert r267961, r267973:
These changes prevent sysctl(8) from returning proper output,
such as:
1) no output from sysctl(8)
2) erroneously returning ENOMEM with tools like truss(1)
or uname(1)
truss: can not get etype: Cannot allocate memory
Notes
Notes:
svn path=/head/; revision=267985
Diffstat (limited to 'sys/geom/shsec/g_shsec.c')
| -rw-r--r-- | sys/geom/shsec/g_shsec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c index bfdc8fdc1672..9f8723f619c8 100644 --- a/sys/geom/shsec/g_shsec.c +++ b/sys/geom/shsec/g_shsec.c @@ -71,10 +71,12 @@ SYSCTL_DECL(_kern_geom); static SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW, 0, "GEOM_SHSEC stuff"); static u_int g_shsec_debug = 0; -SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RWTUN, &g_shsec_debug, 0, +TUNABLE_INT("kern.geom.shsec.debug", &g_shsec_debug); +SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RW, &g_shsec_debug, 0, "Debug level"); static u_int g_shsec_maxmem = MAXPHYS * 100; -SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, maxmem, CTLFLAG_RDTUN, &g_shsec_maxmem, +TUNABLE_INT("kern.geom.shsec.maxmem", &g_shsec_maxmem); +SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, maxmem, CTLFLAG_RD, &g_shsec_maxmem, 0, "Maximum memory that can be allocated for I/O (in bytes)"); static u_int g_shsec_alloc_failed = 0; SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, alloc_failed, CTLFLAG_RD, |