From owner-p4-projects@FreeBSD.ORG  Sun Aug 22 05:49:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E7EA910656A4; Sun, 22 Aug 2010 05:49:57 +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 A66261065697
	for <perforce@FreeBSD.org>; Sun, 22 Aug 2010 05:49:57 +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 94DA78FC08
	for <perforce@FreeBSD.org>; Sun, 22 Aug 2010 05:49:57 +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 o7M5nvN4014945
	for <perforce@FreeBSD.org>; Sun, 22 Aug 2010 05:49:57 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7M5nvwD014942
	for perforce@freebsd.org; Sun, 22 Aug 2010 05:49:57 GMT
	(envelope-from lz@FreeBSD.org)
Date: Sun, 22 Aug 2010 05:49:57 GMT
Message-Id: <201008220549.o7M5nvwD014942@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 182718 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: Sun, 22 Aug 2010 05:49:58 -0000

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

Change 182718 by lz@gnehzuil-freebsd on 2010/08/22 05:49:07

	       Recovery ext2fs.h file.

Affected files ...

.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#10 edit

Differences ...

==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#10 (text+ko) ====

@@ -39,6 +39,7 @@
 
 #include <sys/types.h>
 #include <sys/lock.h>
+#include <fs/ext2fs/ext2_rsv_win.h>
 #include <machine/atomic.h>
 
 /*
@@ -92,6 +93,15 @@
  */
 #define MAXMNTLEN 512
 
+/* ext4 flex block group data structure */
+struct ext4_flex_groups {
+        long e2fg_nifree;
+        long e2fg_nbfree;
+        long e2fg_ndirs;
+};
+
+#define EXT4_FLEX_ALLOC_DIR_SIZE 4
+
 /*
  * Super block for an ext2fs file system.
  */
@@ -205,6 +215,13 @@
 	off_t e2fs_maxfilesize;
 	struct ext2_gd *e2fs_gd;  /* Group Descriptors */
 
+	struct mtx e2fs_rsv_lock;               /* Protect reservation window RB tree */
+	struct ext2_rsv_win_tree e2fs_rsv_tree; /* Reservation window index */
+
+        u_int8_t e2fs_log_gpf;    /* FLEX_BG group size */
+        int      e2fs_descpbbits;
+        struct ext4_flex_groups *e2fs_fg;
+
         u_int16_t e2fs_min_extra_isize;        /* all inodes have at least some bytes */
         u_int16_t e2fs_want_extra_isize;       /* new inodes should reserve some bytes */
 };
@@ -252,8 +269,7 @@
 #define EXT4F_INCOMPAT_EXTENTS          0x0040
 #define EXT4F_INCOMPAT_64BIT            0x0080
 #define EXT4F_INCOMPAT_MMP              0x0100
-#define EXT4F_INCOMPAT_FLEX_BG          0x0200
-#define EXT4F_INCOMPAT_EAINODE          0x0400
+#define EXT4F_INCOMPAT_FLEX_BG          0X0200
 
 /*
  * Features supported in this implementation