From owner-svn-src-all@FreeBSD.ORG  Sun Dec  8 09:34:56 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EB3DC478;
 Sun,  8 Dec 2013 09:34:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6AE31684;
 Sun,  8 Dec 2013 09:34:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB89YuXV095258;
 Sun, 8 Dec 2013 09:34:56 GMT (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB89YuAD095256;
 Sun, 8 Dec 2013 09:34:56 GMT (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201312080934.rB89YuAD095256@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sun, 8 Dec 2013 09:34:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259096 - in head/sys/geom: cache journal
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Dec 2013 09:34:57 -0000

Author: jhibbits
Date: Sun Dec  8 09:34:56 2013
New Revision: 259096
URL: http://svnweb.freebsd.org/changeset/base/259096

Log:
  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

Modified:
  head/sys/geom/cache/g_cache.c
  head/sys/geom/journal/g_journal.c

Modified: head/sys/geom/cache/g_cache.c
==============================================================================
--- head/sys/geom/cache/g_cache.c	Sun Dec  8 06:52:22 2013	(r259095)
+++ head/sys/geom/cache/g_cache.c	Sun Dec  8 09:34:56 2013	(r259096)
@@ -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);

Modified: head/sys/geom/journal/g_journal.c
==============================================================================
--- head/sys/geom/journal/g_journal.c	Sun Dec  8 06:52:22 2013	(r259095)
+++ head/sys/geom/journal/g_journal.c	Sun Dec  8 09:34:56 2013	(r259096)
@@ -168,7 +168,7 @@ SYSCTL_UINT(_kern_geom_journal_cache, OI
 static int
 g_journal_cache_switch_sysctl(SYSCTL_HANDLER_ARGS)
 {
-	int cswitch;
+	u_int cswitch;
 	int error;
 
 	cswitch = g_journal_cache_switch;