From owner-svn-src-stable@freebsd.org  Thu Jan  4 16:18:31 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-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 D84DCEC0C21;
 Thu,  4 Jan 2018 16:18:31 +0000 (UTC)
 (envelope-from markj@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 A1D8871604;
 Thu,  4 Jan 2018 16:18:31 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w04GIUPc050826;
 Thu, 4 Jan 2018 16:18:30 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w04GIUE5050825;
 Thu, 4 Jan 2018 16:18:30 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201801041618.w04GIUE5050825@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 4 Jan 2018 16:18:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r327552 - stable/11/usr.sbin/makefs
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/11/usr.sbin/makefs
X-SVN-Commit-Revision: 327552
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jan 2018 16:18:31 -0000

Author: markj
Date: Thu Jan  4 16:18:30 2018
New Revision: 327552
URL: https://svnweb.freebsd.org/changeset/base/327552

Log:
  MFC r326912:
  Fix a logic bug in makefs lazy inode initialization.

Modified:
  stable/11/usr.sbin/makefs/ffs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/makefs/ffs.c
==============================================================================
--- stable/11/usr.sbin/makefs/ffs.c	Thu Jan  4 16:17:31 2018	(r327551)
+++ stable/11/usr.sbin/makefs/ffs.c	Thu Jan  4 16:18:30 2018	(r327552)
@@ -1134,7 +1134,7 @@ ffs_write_inode(union dinode *dp, uint32_t ino, const 
 	 * Initialize inode blocks on the fly for UFS2.
 	 */
 	initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap);
-	if (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk &&
+	while (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk &&
 	    initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) {
 		memset(buf, 0, fs->fs_bsize);
 		dip = (struct ufs2_dinode *)buf;