From owner-svn-src-stable@FreeBSD.ORG  Mon Feb 13 07:30:42 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DEE4C106566C;
	Mon, 13 Feb 2012 07:30:42 +0000 (UTC)
	(envelope-from truckman@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CCFC88FC0A;
	Mon, 13 Feb 2012 07:30:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1D7Ug77022120;
	Mon, 13 Feb 2012 07:30:42 GMT
	(envelope-from truckman@svn.freebsd.org)
Received: (from truckman@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1D7Ugbp022118;
	Mon, 13 Feb 2012 07:30:42 GMT
	(envelope-from truckman@svn.freebsd.org)
Message-Id: <201202130730.q1D7Ugbp022118@svn.freebsd.org>
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 13 Feb 2012 07:30:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231574 - stable/9/sbin/fsdb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2012 07:30:43 -0000

Author: truckman
Date: Mon Feb 13 07:30:42 2012
New Revision: 231574
URL: http://svn.freebsd.org/changeset/base/231574

Log:
  MFC r231102:
  
  Improve sparse file handling when printing the block list for an inode by
  not bailing out early when a hole is encountered in the direct block list.
  Print NULL block pointers in the direct block list.  Simplify the
  code that prints the fragment count.
  
  Match the style of the existing code.
  
  Reviewed by:	mckusick

Modified:
  stable/9/sbin/fsdb/fsdbutil.c
Directory Properties:
  stable/9/sbin/fsdb/   (props changed)

Modified: stable/9/sbin/fsdb/fsdbutil.c
==============================================================================
--- stable/9/sbin/fsdb/fsdbutil.c	Mon Feb 13 01:44:12 2012	(r231573)
+++ stable/9/sbin/fsdb/fsdbutil.c	Mon Feb 13 07:30:42 2012	(r231574)
@@ -295,22 +295,21 @@ printblocks(ino_t inum, union dinode *dp
     printf("Blocks for inode %d:\n", inum);
     printf("Direct blocks:\n");
     ndb = howmany(DIP(dp, di_size), sblock.fs_bsize);
-    for (i = 0; i < NDADDR; i++) {
-	if (DIP(dp, di_db[i]) == 0) {
-	    putchar('\n');
-	    return;
-	}
+    for (i = 0; i < NDADDR && i < ndb; i++) {
 	if (i > 0)
 	    printf(", ");
 	blkno = DIP(dp, di_db[i]);
 	printf("%jd", (intmax_t)blkno);
-	if (--ndb == 0 && (offset = blkoff(&sblock, DIP(dp, di_size))) != 0) {
+    }
+    if (ndb <= NDADDR) {
+	offset = blkoff(&sblock, DIP(dp, di_size));
+	if (offset != 0) {
 	    nfrags = numfrags(&sblock, fragroundup(&sblock, offset));
 	    printf(" (%d frag%s)", nfrags, nfrags > 1? "s": "");
 	}
     }
     putchar('\n');
-    if (ndb == 0)
+    if (ndb <= NDADDR)
 	return;
 
     bufp = malloc((unsigned int)sblock.fs_bsize);