svn commit: r322513 - stable/10/sys/geom/journal

[Konstantin Belousov]

On Tue, Aug 15, 2017 at 04:48:06PM -0400, Mike Tancsa wrote:
> Not sure if this is just me or not, but on a nanobsd i386 image, this
> breaks building the image.
> 
> 	---Mike
> 
> --- all_subdir_geom_journal ---
> --- g_journal.o ---
> /usr/src/sys/modules/geom/geom_journal/../../../geom/journal/g_journal.c:136:1:
> error: incompatible pointer types initializing 'int *' with an
> expression of type 'u_long *' (aka 'unsigned long *')
> [-Werror,-Wincompatible-pointer-types]
> TUNABLE_INT("kern.geom.journal.cache.limit", &g_journal_cache_limit);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Try this on stable/10.

Index: sys/geom/journal/g_journal.c
===================================================================
--- sys/geom/journal/g_journal.c	(revision 322542)
+++ sys/geom/journal/g_journal.c	(working copy)
@@ -133,7 +133,7 @@
 
 static u_long g_journal_cache_used = 0;
 static u_long g_journal_cache_limit = 64 * 1024 * 1024;
-TUNABLE_INT("kern.geom.journal.cache.limit", &g_journal_cache_limit);
+TUNABLE_LONG("kern.geom.journal.cache.limit", &g_journal_cache_limit);
 static u_int g_journal_cache_divisor = 2;
 TUNABLE_INT("kern.geom.journal.cache.divisor", &g_journal_cache_divisor);
 static u_int g_journal_cache_switch = 90;