From owner-svn-src-all@freebsd.org  Wed Apr 27 01:32:13 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 43A81B1D611;
 Wed, 27 Apr 2016 01:32:13 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 06FBE127D;
 Wed, 27 Apr 2016 01:32:12 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3R1WCPT030212;
 Wed, 27 Apr 2016 01:32:12 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3R1WCd9030211;
 Wed, 27 Apr 2016 01:32:12 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201604270132.u3R1WCd9030211@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 27 Apr 2016 01:32:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298679 - head/sbin/fsck_ffs
X-SVN-Group: head
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.21
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Apr 2016 01:32:13 -0000

Author: pfg
Date: Wed Apr 27 01:32:11 2016
New Revision: 298679
URL: https://svnweb.freebsd.org/changeset/base/298679

Log:
  fsck_ffs: Revert partially the unsigned changes.
  
  Any value of uint16_t will be internally promoted to int so
  changing them to an unsigned value doesn't help.
  
  Make clear we want to use uint32_t for closedisk()
  
  X-MFC with:	r298551

Modified:
  head/sbin/fsck_ffs/suj.c

Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c	Wed Apr 27 00:10:32 2016	(r298678)
+++ head/sbin/fsck_ffs/suj.c	Wed Apr 27 01:32:11 2016	(r298679)
@@ -217,7 +217,7 @@ static void
 closedisk(const char *devnam)
 {
 	struct csum *cgsum;
-	u_int i;
+	uint32_t i;
 
 	/*
 	 * Recompute the fs summary info from correct cs summaries.
@@ -2252,7 +2252,7 @@ suj_build(void)
 	struct suj_seg *seg;
 	union jrec *rec;
 	int off;
-	u_int i;
+	int i;
 
 	TAILQ_FOREACH(seg, &allsegs, ss_next) {
 		if (debug)
@@ -2540,7 +2540,7 @@ suj_read(void)
 	struct jsegrec *rec;
 	ufs2_daddr_t blk;
 	int readsize;
-	u_int blocks;
+	int blocks;
 	int recsize;
 	int size;
 	u_int i;