From owner-svn-src-all@FreeBSD.ORG  Sun Jun 21 06:49:45 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE84F31B;
 Sun, 21 Jun 2015 06:49:45 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BBD7965C;
 Sun, 21 Jun 2015 06:49:45 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L6njK1056640;
 Sun, 21 Jun 2015 06:49:45 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L6njum056635;
 Sun, 21 Jun 2015 06:49:45 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201506210649.t5L6njum056635@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sun, 21 Jun 2015 06:49:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284669 - stable/10/sbin/growfs
X-SVN-Group: stable-10
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.20
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, 21 Jun 2015 06:49:45 -0000

Author: trasz
Date: Sun Jun 21 06:49:44 2015
New Revision: 284669
URL: https://svnweb.freebsd.org/changeset/base/284669

Log:
  MFC r281929:
  
  Fix growfs(8) build with debug enabled (make -DGFSDBG).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sbin/growfs/Makefile
  stable/10/sbin/growfs/growfs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/growfs/Makefile
==============================================================================
--- stable/10/sbin/growfs/Makefile	Sun Jun 21 06:44:32 2015	(r284668)
+++ stable/10/sbin/growfs/Makefile	Sun Jun 21 06:49:44 2015	(r284669)
@@ -4,8 +4,6 @@
 # $FreeBSD$
 #
 
-#GFSDBG=
-
 .include <bsd.own.mk>
 
 .PATH:	${.CURDIR}/../mount
@@ -16,7 +14,9 @@ MAN=	growfs.8
 CFLAGS+=-I${.CURDIR}/../mount
 
 .if defined(GFSDBG)
-SRCS+=  debug.c
+SRCS+=	debug.c
+CFLAGS+= -DFS_DEBUG
+NO_WCAST_ALIGN= yes
 .endif  
 
 DPADD=	${LIBUTIL}

Modified: stable/10/sbin/growfs/growfs.c
==============================================================================
--- stable/10/sbin/growfs/growfs.c	Sun Jun 21 06:44:32 2015	(r284668)
+++ stable/10/sbin/growfs/growfs.c	Sun Jun 21 06:49:44 2015	(r284669)
@@ -161,7 +161,7 @@ growfs(int fsi, int fso, unsigned int Nf
 #ifdef FS_DEBUG
 	{
 		struct csum *dbg_csp;
-		int dbg_csc;
+		u_int32_t dbg_csc;
 		char dbg_line[80];
 
 		dbg_csp = fscs;
@@ -242,7 +242,7 @@ growfs(int fsi, int fso, unsigned int Nf
 #ifdef FS_DEBUG
 	{
 		struct csum	*dbg_csp;
-		int	dbg_csc;
+		u_int32_t	dbg_csc;
 		char	dbg_line[80];
 
 		dbg_csp = fscs;