From owner-freebsd-stable@freebsd.org Tue Aug 15 21:05:37 2017 Return-Path: Delivered-To: freebsd-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06306DCB74C for ; Tue, 15 Aug 2017 21:05:37 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [176.36.249.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8AAD1775; Tue, 15 Aug 2017 21:05:35 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v7FL5TSM002604 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 16 Aug 2017 00:05:30 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v7FL5TSM002604 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v7FL5TCV002602; Wed, 16 Aug 2017 00:05:29 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 16 Aug 2017 00:05:29 +0300 From: Konstantin Belousov To: Mike Tancsa Cc: Kirk McKusick , FreeBSD-STABLE Mailing List Subject: Re: svn commit: r322513 - stable/10/sys/geom/journal Message-ID: <20170815210529.GM1700@kib.kiev.ua> References: <201708141912.v7EJCqsc017835@repo.freebsd.org> <01f1450f-cfc3-84c8-d2ad-cdd1486bedb4@sentex.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <01f1450f-cfc3-84c8-d2ad-cdd1486bedb4@sentex.net> User-Agent: Mutt/1.8.3 (2017-05-23) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2017 21:05:37 -0000 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;