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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to