From owner-svn-src-head@FreeBSD.ORG  Tue Jun 12 21:37:28 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0D66E106564A;
	Tue, 12 Jun 2012 21:37:28 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EC9088FC15;
	Tue, 12 Jun 2012 21:37:27 +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 q5CLbRod077125;
	Tue, 12 Jun 2012 21:37:27 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5CLbReK077123;
	Tue, 12 Jun 2012 21:37:27 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206122137.q5CLbReK077123@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 12 Jun 2012 21:37:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236976 - head/sbin/fsck_ffs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 12 Jun 2012 21:37:28 -0000

Author: kib
Date: Tue Jun 12 21:37:27 2012
New Revision: 236976
URL: http://svn.freebsd.org/changeset/base/236976

Log:
  For incompleted block allocations or frees, the inode block count usage
  must be recalculated. The blk_check pass of suj checker explicitely marks
  inodes which owned such blocks as needing block count adjustment. But
  ino_adjblks() is only called by cg_trunc pass, which is performed before
  blk_check. As result, the block use count for such inodes is left wrong.
  This causes full fsck run after journaled run to still find inconsistencies
  like 'INCORRECT BLOCK COUNT I=14557 (328 should be 0)' in phase 1.
  
  Fix this issue by running additional adj_blk pass after blk_check, which
  updates the field.
  
  Reviewed by:	jeff, mckusick
  MFC after:	1 week

Modified:
  head/sbin/fsck_ffs/suj.c

Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c	Tue Jun 12 21:03:24 2012	(r236975)
+++ head/sbin/fsck_ffs/suj.c	Tue Jun 12 21:37:27 2012	(r236976)
@@ -1789,6 +1789,20 @@ cg_trunc(struct suj_cg *sc)
 	}
 }
 
+static void
+cg_adj_blk(struct suj_cg *sc)
+{
+	struct suj_ino *sino;
+	int i;
+
+	for (i = 0; i < SUJ_HASHSIZE; i++) {
+		LIST_FOREACH(sino, &sc->sc_inohash[i], si_next) {
+			if (sino->si_blkadj)
+				ino_adjblks(sino);
+		}
+	}
+}
+
 /*
  * Free any partially allocated blocks and then resolve inode block
  * counts.
@@ -2720,6 +2734,7 @@ suj_check(const char *filesys)
 		printf("** Processing journal entries.\n");
 		cg_apply(cg_trunc);
 		cg_apply(cg_check_blk);
+		cg_apply(cg_adj_blk);
 		cg_apply(cg_check_ino);
 	}
 	if (preen == 0 && (jrecs > 0 || jbytes > 0) && reply("WRITE CHANGES") == 0)