From owner-svn-src-head@FreeBSD.ORG  Tue Aug 20 07:19:59 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1D09DDA1;
 Tue, 20 Aug 2013 07:19:59 +0000 (UTC) (envelope-from des@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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B1082840;
 Tue, 20 Aug 2013 07:19:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7K7Jw1Q080409;
 Tue, 20 Aug 2013 07:19:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7K7JwQh080408;
 Tue, 20 Aug 2013 07:19:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201308200719.r7K7JwQh080408@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 20 Aug 2013 07:19:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254553 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Aug 2013 07:19:59 -0000

Author: des
Date: Tue Aug 20 07:19:58 2013
New Revision: 254553
URL: http://svnweb.freebsd.org/changeset/base/254553

Log:
  Fix the zeroing loop.  I must have been drunk when I wrote this...
  
  MFC after:	3 days

Modified:
  head/sbin/fsck_ffs/fsutil.c

Modified: head/sbin/fsck_ffs/fsutil.c
==============================================================================
--- head/sbin/fsck_ffs/fsutil.c	Tue Aug 20 07:15:16 2013	(r254552)
+++ head/sbin/fsck_ffs/fsutil.c	Tue Aug 20 07:19:58 2013	(r254553)
@@ -629,6 +629,10 @@ blerase(int fd, ufs2_daddr_t blk, long s
 	return;
 }
 
+/*
+ * Fill a contiguous region with all-zeroes.  Note ZEROBUFSIZE is by
+ * definition a multiple of dev_bsize.
+ */
 void
 blzero(int fd, ufs2_daddr_t blk, long size)
 {
@@ -637,9 +641,8 @@ blzero(int fd, ufs2_daddr_t blk, long si
 
 	if (fd < 0)
 		return;
-	len = ZEROBUFSIZE;
 	if (zero == NULL) {
-		zero = calloc(len, 1);
+		zero = calloc(ZEROBUFSIZE, 1);
 		if (zero == NULL)
 			errx(EEXIT, "cannot allocate buffer pool");
 	}
@@ -647,10 +650,7 @@ blzero(int fd, ufs2_daddr_t blk, long si
 	if (lseek(fd, offset, 0) < 0)
 		rwerror("SEEK BLK", blk);
 	while (size > 0) {
-		if (size > len)
-			size = len;
-		else
-			len = size;
+		len = size > ZEROBUFSIZE ? ZEROBUFSIZE : size;
 		if (write(fd, zero, len) != len)
 			rwerror("WRITE BLK", blk);
 		blk += len / dev_bsize;