From owner-p4-projects@FreeBSD.ORG  Mon Mar 14 09:56:47 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53BF01065673; Mon, 14 Mar 2011 09:56:47 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15ADF1065670
	for <perforce@FreeBSD.org>; Mon, 14 Mar 2011 09:56:47 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id DCBF48FC13
	for <perforce@FreeBSD.org>; Mon, 14 Mar 2011 09:56:46 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2E9ukGD051615
	for <perforce@FreeBSD.org>; Mon, 14 Mar 2011 09:56:46 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2E9ukeQ051612
	for perforce@freebsd.org; Mon, 14 Mar 2011 09:56:46 GMT
	(envelope-from lz@FreeBSD.org)
Date: Mon, 14 Mar 2011 09:56:46 GMT
Message-Id: <201103140956.p2E9ukeQ051612@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu <lz@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 190013 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Mar 2011 09:56:47 -0000

http://p4web.freebsd.org/@@190013?ac=10

Change 190013 by lz@freebsd-dev on 2011/03/14 09:56:33

	       Invalidate cluster summary information in ext2_reload().

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#13 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#13 (text+ko) ====

@@ -407,7 +407,7 @@
  * Things to do to update the mount:
  *	1) invalidate all cached meta-data.
  *	2) re-read superblock from disk.
- *	3) re-read summary information from disk.
+ *	3) invalidate all cluster summary information.
  *	4) invalidate all inactive vnodes.
  *	5) invalidate all cached file data.
  *	6) re-read inode data for all active vnodes.
@@ -421,6 +421,7 @@
 	struct buf *bp;
 	struct ext2fs *es;
 	struct m_ext2fs *fs;
+        struct csum *sump;
 	int error;
         int i;
         int32_t *lp;
@@ -455,20 +456,24 @@
 		return (error);
 	}
 
-        /* 
-         * FIXME: It seems that we don't need to do something
-         * for reallocblk.
+#ifdef UNKLAR
+	if (fs->fs_sbsize < SBSIZE)
+		bp->b_flags |= B_INVAL;
+#endif
+	brelse(bp);
+
+        /*
+         * Step 3: invalidate all cluster summary information.
          */
         if (fs->e2fs_contigsumsize > 0) {
                 lp = fs->e2fs_maxcluster;
-                for (i = 0; i < fs->e2fs_gcount; i++)
+                sump = fs->e2fs_clustersum;
+                for (i = 0; i < fs->e2fs_gcount; i++, sump++) {
                         *lp++ = fs->e2fs_contigsumsize;
+                        sump->cs_init = 0;
+                        bzero(sump->cs_sum, fs->e2fs_contigsumsize + 1);
+                }
         }
-#ifdef UNKLAR
-	if (fs->fs_sbsize < SBSIZE)
-		bp->b_flags |= B_INVAL;
-#endif
-	brelse(bp);
 
 loop:
 	MNT_ILOCK(mp);
@@ -525,11 +530,11 @@
 	struct cdev *dev = devvp->v_rdev;
 	struct g_consumer *cp;
 	struct bufobj *bo;
+        struct csum *sump;
 	int error;
 	int ronly;
         int i, size;
         int32_t *lp;
-        struct csum *sump;
 
 	ronly = vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0);
 	/* XXX: use VOP_ACESS to check FS perms */