[Ocfs2-tools-devel] [PATCH 2/2] udpate ocfs2 metadata members for sizetest, v3

[Coly Li]

This patch updates the ocfs2 metadata members referenced in sizetest/sizetest.c, and the output result in
sizetest/sizes.txt.

Signed-off-by: Coly Li <coly.li at suse.de>
Cc: Joel Becker <joel.becker at oracle.com>
Cc: Tao Ma <tao.ma at oracle.com>
---
 sizetest/sizes.txt  |   24 +++++++++++++++++++-----
 sizetest/sizetest.c |    6 ++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/sizetest/sizes.txt b/sizetest/sizes.txt
index d03b67c..272f1bf 100644
--- a/sizetest/sizes.txt
+++ b/sizetest/sizes.txt
@@ -30,7 +30,7 @@

 [off]	ocfs2_extent_block  	[size]
 0x000	h_signature         	+0x08
-0x008	h_reserved1         	+0x08
+0x008	h_check             	+0x08
 0x010	h_suballoc_slot     	+0x02
 0x012	h_suballoc_bit      	+0x02
 0x014	h_fs_generation     	+0x04
@@ -59,10 +59,15 @@
 0x03C	s_clustersize_bits  	+0x04
 0x040	s_max_slots         	+0x02
 0x042	s_tunefs_flag       	+0x02
-0x044	s_reserved1         	+0x04
+0x044	s_uuid_hash         	+0x04
 0x048	s_first_cluster_group	+0x08
 0x050	s_label             	+0x40
 0x090	s_uuid              	+0x10
+0x0A0	s_cluster_info      	+0x18
+0x0B8	s_xattr_inline_size 	+0x02
+0x0BA	s_reserved0         	+0x02
+0x0BC	s_dx_seed           	+0x0C
+0x0C8	s_reserved2         	+0x78
 	Total               	0x140

 [off]	ocfs2_local_alloc   	[size]
@@ -78,7 +83,8 @@
 0x008	i_generation        	+0x04
 0x00C	i_suballoc_slot     	+0x02
 0x00E	i_suballoc_bit      	+0x02
-0x010	i_reserved0         	+0x04
+0x010	i_links_count_hi    	+0x02
+0x012	i_xattr_inline_size 	+0x02
 0x014	i_clusters          	+0x04
 0x018	i_uid               	+0x04
 0x01C	i_gid               	+0x04
@@ -97,8 +103,13 @@
 0x068	i_ctime_nsec        	+0x04
 0x06C	i_mtime_nsec        	+0x04
 0x070	i_attr              	+0x04
+0x074	i_orphaned_slot     	+0x02
 0x076	i_dyn_features      	+0x02
-0x078	i_reserved2         	+0x40
+0x078	i_xattr_loc         	+0x08
+0x080	i_check             	+0x08
+0x088	i_dx_root           	+0x08
+0x090	i_refcount_loc      	+0x08
+0x098	i_reserved2         	+0x20
 0x0B8	id1.i_pad1          	+0x08
 0x0B8	id1.dev1.i_rdev     	+0x08
 0x0B8	id1.bitmap1.i_used  	+0x04
@@ -109,6 +120,8 @@
 0x0C0	id2.i_lab           	+0x10
 0x0C0	id2.i_chain         	+0x10
 0x0C0	id2.i_list          	+0x10
+0x0C0	id2.i_dealloc       	+0x08
+0x0C0	id2.i_data          	+0x08
 0x0C0	id2.i_symlink       	+0x00
 	Total               	0x200

@@ -131,7 +144,8 @@
 0x018	bg_next_group       	+0x08
 0x020	bg_parent_dinode    	+0x08
 0x028	bg_blkno            	+0x08
-0x030	bg_reserved2        	+0x10
+0x030	bg_check            	+0x08
+0x038	bg_reserved2        	+0x08
 0x040	bg_bitmap           	+0x00
 	Total               	0x040

diff --git a/sizetest/sizetest.c b/sizetest/sizetest.c
index bdb06a2..b002011 100644
--- a/sizetest/sizetest.c
+++ b/sizetest/sizetest.c
@@ -144,7 +144,7 @@ static void print_ocfs2_super_block(void)
 	SHOW_OFFSET(struct ocfs2_super_block, s_cluster_info);
 	SHOW_OFFSET(struct ocfs2_super_block, s_xattr_inline_size);
 	SHOW_OFFSET(struct ocfs2_super_block, s_reserved0);
-	SHOW_OFFSET(struct ocfs2_super_block, s_reserved1);
+	SHOW_OFFSET(struct ocfs2_super_block, s_dx_seed);
 	SHOW_OFFSET(struct ocfs2_super_block, s_reserved2);
 	
         END_TYPE(struct ocfs2_super_block);
@@ -173,7 +173,7 @@ static void print_ocfs2_dinode(void)
 	SHOW_OFFSET(struct ocfs2_dinode, i_generation);
 	SHOW_OFFSET(struct ocfs2_dinode, i_suballoc_slot);
 	SHOW_OFFSET(struct ocfs2_dinode, i_suballoc_bit);
-	SHOW_OFFSET(struct ocfs2_dinode, i_reserved0);
+	SHOW_OFFSET(struct ocfs2_dinode, i_links_count_hi);
 	SHOW_OFFSET(struct ocfs2_dinode, i_xattr_inline_size);
 	SHOW_OFFSET(struct ocfs2_dinode, i_clusters);
 	SHOW_OFFSET(struct ocfs2_dinode, i_uid);
@@ -197,6 +197,8 @@ static void print_ocfs2_dinode(void)
 	SHOW_OFFSET(struct ocfs2_dinode, i_dyn_features);
 	SHOW_OFFSET(struct ocfs2_dinode, i_xattr_loc);
 	SHOW_OFFSET(struct ocfs2_dinode, i_check);
+	SHOW_OFFSET(struct ocfs2_dinode, i_dx_root);
+	SHOW_OFFSET(struct ocfs2_dinode, i_refcount_loc);
 	SHOW_OFFSET(struct ocfs2_dinode, i_reserved2);

 	SHOW_OFFSET(struct ocfs2_dinode, id1.i_pad1);
-- 
Coly Li
SuSE Labs