summaryrefslogtreecommitdiffstats
path: root/sys/geom
diff options
context:
space:
mode:
authorjhibbits <jhibbits@FreeBSD.org>2013-12-08 09:34:56 +0000
committerjhibbits <jhibbits@FreeBSD.org>2013-12-08 09:34:56 +0000
commitd6564a729a245b4f2f117a23bcaf9d7328f55a7a (patch)
treef40fb3788090b377479c1551553dafa292b311c8 /sys/geom
parent707bca1cda91d4d5c94469435094f4226e19b5ce (diff)
downloadFreeBSD-src-d6564a729a245b4f2f117a23bcaf9d7328f55a7a.zip
FreeBSD-src-d6564a729a245b4f2f117a23bcaf9d7328f55a7a.tar.gz
Partially revert r259080. bde@ pointed out that there are a lot more style bugs
going on in here than can be fixed, and I introduced some of my own. Rather than fix the whole host of them, back out my bugs. Found by: bde X-MFC with: r259080
Diffstat (limited to 'sys/geom')
-rw-r--r--sys/geom/cache/g_cache.c2
-rw-r--r--sys/geom/journal/g_journal.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c
index 28df841..ba701ac 100644
--- a/sys/geom/cache/g_cache.c
+++ b/sys/geom/cache/g_cache.c
@@ -67,7 +67,7 @@ static u_int g_cache_used_hi = 20;
static int
sysctl_handle_pct(SYSCTL_HANDLER_ARGS)
{
- int val;
+ u_int val = *(u_int *)arg1;
int error;
error = sysctl_handle_int(oidp, &val, 0, req);
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index da49593..3908478 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -168,7 +168,7 @@ SYSCTL_UINT(_kern_geom_journal_cache, OID_AUTO, divisor, CTLFLAG_RDTUN,
static int
g_journal_cache_switch_sysctl(SYSCTL_HANDLER_ARGS)
{
- int cswitch;
+ u_int cswitch;
int error;
cswitch = g_journal_cache_switch;
OpenPOWER on IntegriCloud