Date: Wed, 16 Aug 2017 00:05:29 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Mike Tancsa <mike@sentex.net> Cc: Kirk McKusick <mckusick@FreeBSD.org>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: svn commit: r322513 - stable/10/sys/geom/journal Message-ID: <20170815210529.GM1700@kib.kiev.ua> In-Reply-To: <01f1450f-cfc3-84c8-d2ad-cdd1486bedb4@sentex.net> References: <201708141912.v7EJCqsc017835@repo.freebsd.org> <01f1450f-cfc3-84c8-d2ad-cdd1486bedb4@sentex.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170815210529.GM1700>