[Ocfs2-tools-commits] jlbec commits r568 - in trunk: .
debugfs.ocfs2 debugfs.ocfs2/include sizetest
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jan 21 18:56:50 CST 2005
Author: jlbec
Date: 2005-01-21 18:56:49 -0600 (Fri, 21 Jan 2005)
New Revision: 568
Modified:
trunk/Makefile
trunk/debugfs.ocfs2/include/dump.h
trunk/debugfs.ocfs2/include/journal.h
trunk/debugfs.ocfs2/include/readfs.h
trunk/debugfs.ocfs2/include/utils.h
trunk/debugfs.ocfs2/journal.c
trunk/debugfs.ocfs2/readfs.c
trunk/debugfs.ocfs2/utils.c
trunk/sizetest/x86_32.txt
trunk/sizetest/x86_64.txt
Log:
o Turn some __u64s into uint64_t.
o Put in x86_64 and i386 output for sizetest's new output.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/Makefile 2005-01-22 00:56:49 UTC (rev 568)
@@ -22,7 +22,7 @@
$(error could not detect architecture for tools)
endif
-SUBDIRS = libocfs2 libo2cb fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 clusterbo mount.ocfs2 listuuid extras patches
+SUBDIRS = libocfs2 libo2cb fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 clusterbo mount.ocfs2 listuuid sizetest extras patches
ifdef BUILD_OCFS2CDSL
SUBDIRS += ocfs2cdsl
Modified: trunk/debugfs.ocfs2/include/dump.h
===================================================================
--- trunk/debugfs.ocfs2/include/dump.h 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/include/dump.h 2005-01-22 00:56:49 UTC (rev 568)
@@ -44,9 +44,9 @@
char *buf, void *priv_data);
void dump_jbd_header (FILE *out, journal_header_t *header);
void dump_jbd_superblock (FILE *out, journal_superblock_t *jsb);
-void dump_jbd_block (FILE *out, journal_header_t *header, __u64 blknum);
-void dump_jbd_metadata (FILE *out, int type, char *buf, __u64 blknum);
-void dump_jbd_unknown (FILE *out, __u64 start, __u64 end);
+void dump_jbd_block (FILE *out, journal_header_t *header, uint64_t blknum);
+void dump_jbd_metadata (FILE *out, int type, char *buf, uint64_t blknum);
+void dump_jbd_unknown (FILE *out, uint64_t start, uint64_t end);
void dump_slots (FILE *out, char *buf, uint32_t len);
void dump_fast_symlink (FILE *out, char *link);
Modified: trunk/debugfs.ocfs2/include/journal.h
===================================================================
--- trunk/debugfs.ocfs2/include/journal.h 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/include/journal.h 2005-01-22 00:56:49 UTC (rev 568)
@@ -28,7 +28,7 @@
#include <jbd.h>
-void read_journal (FILE *out, char *buf, __u64 buflen);
+void read_journal (FILE *out, char *buf, uint64_t buflen);
int detect_block (char *buf);
#endif /* _JOURNAL_H_ */
Modified: trunk/debugfs.ocfs2/include/readfs.h
===================================================================
--- trunk/debugfs.ocfs2/include/readfs.h 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/include/readfs.h 2005-01-22 00:56:49 UTC (rev 568)
@@ -27,12 +27,12 @@
#define __READFS_H__
int read_super_block (int fd, char **buf);
-int read_inode (int fd, __u64 blknum, char *buf, int buflen);
-int read_group (int fd, __u64 blknum, char *buf, int buflen);
+int read_inode (int fd, uint64_t blknum, char *buf, int buflen);
+int read_group (int fd, uint64_t blknum, char *buf, int buflen);
int traverse_extents (int fd, ocfs2_extent_list *ext, GArray *arr, int dump, FILE *out);
void read_dir_block (struct ocfs2_dir_entry *dir, int len, GArray *arr);
-void read_dir (int fd, ocfs2_extent_list *ext, __u64 size, GArray *dirarr);
+void read_dir (int fd, ocfs2_extent_list *ext, uint64_t size, GArray *dirarr);
void read_sysdir (int fd, char *sysdir);
-int read_file (int fd, __u64 blknum, int fdo, char **buf);
+int read_file (int fd, uint64_t blknum, int fdo, char **buf);
#endif /* __READFS_H__ */
Modified: trunk/debugfs.ocfs2/include/utils.h
===================================================================
--- trunk/debugfs.ocfs2/include/utils.h 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/include/utils.h 2005-01-22 00:56:49 UTC (rev 568)
@@ -33,10 +33,10 @@
int verbose;
} rdump_opts;
-void get_vote_flag (__u32 flag, GString *str);
-void get_publish_flag (__u32 flag, GString *str);
-void get_journal_blktyp (__u32 jtype, GString *str);
-void get_tag_flag (__u32 flags, GString *str);
+void get_vote_flag (uint32_t flag, GString *str);
+void get_publish_flag (uint32_t flag, GString *str);
+void get_journal_blktyp (uint32_t jtype, GString *str);
+void get_tag_flag (uint32_t flags, GString *str);
FILE *open_pager(int interactive);
void close_pager(FILE *stream);
int inodestr_to_inode(char *str, uint64_t *blkno);
Modified: trunk/debugfs.ocfs2/journal.c
===================================================================
--- trunk/debugfs.ocfs2/journal.c 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/journal.c 2005-01-22 00:56:49 UTC (rev 568)
@@ -31,15 +31,15 @@
* read_journal()
*
*/
-void read_journal (FILE *out, char *buf, __u64 buflen)
+void read_journal (FILE *out, char *buf, uint64_t buflen)
{
char *block;
- __u64 blocknum;
+ uint64_t blocknum;
journal_header_t *header;
__u32 blksize = 1 << OCFS2_RAW_SB(gbls.fs->fs_super)->s_blocksize_bits;
- __u64 len;
+ uint64_t len;
char *p;
- __u64 last_unknown = 0;
+ uint64_t last_unknown = 0;
int type;
dump_jbd_superblock (out, (journal_superblock_t *) buf);
Modified: trunk/debugfs.ocfs2/readfs.c
===================================================================
--- trunk/debugfs.ocfs2/readfs.c 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/readfs.c 2005-01-22 00:56:49 UTC (rev 568)
@@ -35,11 +35,11 @@
int read_super_block (int fd, char **buf)
{
int ret = -1;
- __u64 off;
+ uint64_t off;
ocfs1_vol_disk_hdr *hdr;
ocfs2_dinode *di;
- __u32 bits = 9;
- __u32 buflen;
+ uint32_t bits = 9;
+ uint32_t buflen;
for (bits = 9; bits < 13; bits++) {
buflen = 1 << bits;
@@ -103,7 +103,7 @@
* read_inode()
*
*/
-int read_inode (int fd, __u64 blknum, char *buf, int buflen)
+int read_inode (int fd, uint64_t blknum, char *buf, int buflen)
{
uint64_t off;
ocfs2_dinode *inode;
@@ -127,7 +127,7 @@
* read_group()
*
*/
-int read_group (int fd, __u64 blknum, char *buf, int buflen)
+int read_group (int fd, uint64_t blknum, char *buf, int buflen)
{
uint64_t off;
ocfs2_group_desc *bg;
@@ -156,9 +156,9 @@
ocfs2_extent_block *blk;
ocfs2_extent_rec *rec;
int ret = 0;
- __u64 off;
+ uint64_t off;
char *buf = NULL;
- __u32 buflen;
+ uint32_t buflen;
int i;
if (dump)
@@ -173,7 +173,7 @@
if (!(buf = memalign(buflen, buflen)))
DBGFS_FATAL("%s", strerror(errno));
- off = (__u64)rec->e_blkno << gbls.blksz_bits;
+ off = (uint64_t)rec->e_blkno << gbls.blksz_bits;
if ((pread64 (fd, buf, buflen, off)) == -1)
DBGFS_FATAL("%s", strerror(errno));
@@ -215,15 +215,15 @@
* read_dir()
*
*/
-void read_dir (int fd, ocfs2_extent_list *ext, __u64 size, GArray *dirarr)
+void read_dir (int fd, ocfs2_extent_list *ext, uint64_t size, GArray *dirarr)
{
ocfs2_extent_rec *rec;
GArray *arr = NULL;
unsigned int i = 0;
char *buf = NULL;
- __u32 len;
- __u64 off;
- __u64 foff;
+ uint32_t len;
+ uint64_t off;
+ uint64_t foff;
arr = g_array_new(0, 1, sizeof(ocfs2_extent_rec));
@@ -322,19 +322,19 @@
* read_file()
*
*/
-int read_file (int fd, __u64 blknum, int fdo, char **buf)
+int read_file (int fd, uint64_t blknum, int fdo, char **buf)
{
ocfs2_dinode *inode = NULL;
GArray *arr = NULL;
ocfs2_extent_rec *rec;
char *p = NULL;
- __u64 off, foff, len;
+ uint64_t off, foff, len;
unsigned int i;
char *newbuf = NULL;
- __u64 newlen = 0;
+ uint64_t newlen = 0;
char *inode_buf = NULL;
- __u64 buflen = 0;
- __u64 rndup = 0;
+ uint64_t buflen = 0;
+ uint64_t rndup = 0;
int ret = -1;
arr = g_array_new(0, 1, sizeof(ocfs2_extent_rec));
Modified: trunk/debugfs.ocfs2/utils.c
===================================================================
--- trunk/debugfs.ocfs2/utils.c 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/debugfs.ocfs2/utils.c 2005-01-22 00:56:49 UTC (rev 568)
@@ -29,7 +29,7 @@
* get_vote_flag()
*
*/
-void get_vote_flag (__u32 flag, GString *str)
+void get_vote_flag (uint32_t flag, GString *str)
{
if (flag & FLAG_VOTE_NODE)
g_string_append (str, "ok ");
@@ -61,7 +61,7 @@
* get_publish_flag()
*
*/
-void get_publish_flag (__u32 flag, GString *str)
+void get_publish_flag (uint32_t flag, GString *str)
{
if (flag & FLAG_FILE_CREATE)
g_string_append (str, "create ");
@@ -147,7 +147,7 @@
* get_journal_blktyp()
*
*/
-void get_journal_blktyp (__u32 jtype, GString *str)
+void get_journal_blktyp (uint32_t jtype, GString *str)
{
switch (jtype) {
case JFS_DESCRIPTOR_BLOCK:
@@ -177,7 +177,7 @@
* get_tag_flag()
*
*/
-void get_tag_flag (__u32 flags, GString *str)
+void get_tag_flag (uint32_t flags, GString *str)
{
if (flags == 0) {
g_string_append (str, "none");
Modified: trunk/sizetest/x86_32.txt
===================================================================
--- trunk/sizetest/x86_32.txt 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/sizetest/x86_32.txt 2005-01-22 00:56:49 UTC (rev 568)
@@ -1,123 +1,133 @@
-sizeof(ocfs2_extent_rec) = 16
- e_cpos = 0 (4)
- e_clusters = 4 (4)
- e_blkno = 8 (8)
+[off] ocfs2_extent_rec [size]
+0x000 e_cpos +0x04
+0x004 e_clusters +0x04
+0x008 e_blkno +0x08
+ Total 0x010
-sizeof(ocfs2_chain_rec) = 16
- c_free = 0 (4)
- c_total = 4 (4)
- c_blkno = 8 (8)
+[off] ocfs2_chain_rec [size]
+0x000 c_free +0x04
+0x004 c_total +0x04
+0x008 c_blkno +0x08
+ Total 0x010
-sizeof(ocfs2_extent_list) = 16
- l_tree_depth = 0 (2)
- l_count = 2 (2)
- l_next_free_rec = 4 (2)
- l_reserved1 = 6 (2)
- l_reserved2 = 8 (8)
- l_recs = 16 (0)
+[off] ocfs2_extent_list [size]
+0x000 l_tree_depth +0x02
+0x002 l_count +0x02
+0x004 l_next_free_rec +0x02
+0x006 l_reserved1 +0x02
+0x008 l_reserved2 +0x08
+0x010 l_recs +0x00
+ Total 0x010
-sizeof(ocfs2_chain_list) = 16
- cl_cpg = 0 (2)
- cl_bpc = 2 (2)
- cl_count = 4 (2)
- cl_next_free_rec = 6 (2)
- cl_reserved1 = 8 (8)
- cl_recs = 16 (0)
+[off] ocfs2_chain_list [size]
+0x000 cl_cpg +0x02
+0x002 cl_bpc +0x02
+0x004 cl_count +0x02
+0x006 cl_next_free_rec +0x02
+0x008 cl_reserved1 +0x08
+0x010 cl_recs +0x00
+ Total 0x010
-sizeof(ocfs2_extent_block) = 64
- h_signature = 0 (8)
- h_reserved1 = 8 (8)
- h_suballoc_node = 16 (2)
- h_suballoc_bit = 18 (2)
- h_fs_generation = 20 (4)
- h_blkno = 24 (8)
- h_reserved3 = 32 (8)
- h_next_leaf_blk = 40 (8)
- h_list = 48 (16)
+[off] ocfs2_extent_block [size]
+0x000 h_signature +0x08
+0x008 h_reserved1 +0x08
+0x010 h_suballoc_node +0x02
+0x012 h_suballoc_bit +0x02
+0x014 h_fs_generation +0x04
+0x018 h_blkno +0x08
+0x020 h_reserved3 +0x08
+0x028 h_next_leaf_blk +0x08
+0x030 h_list +0x10
+ Total 0x040
-sizeof(ocfs2_super_block) = 160
- s_major_rev_level = 0 (2)
- s_minor_rev_level = 2 (2)
- s_mnt_count = 4 (2)
- s_max_mnt_count = 6 (2)
- s_state = 8 (2)
- s_errors = 10 (2)
- s_checkinterval = 12 (4)
- s_lastcheck = 16 (8)
- s_creator_os = 24 (4)
- s_feature_compat = 28 (4)
- s_feature_incompat = 32 (4)
- s_feature_ro_compat = 36 (4)
- s_root_blkno = 40 (8)
- s_system_dir_blkno = 48 (8)
- s_blocksize_bits = 56 (4)
- s_clustersize_bits = 60 (4)
- s_max_nodes = 64 (2)
- s_reserved1 = 66 (2)
- s_reserved2 = 68 (4)
- s_first_cluster_group = 72 (8)
- s_label = 80 (64)
- s_uuid = 144 (16)
+[off] ocfs2_super_block [size]
+0x000 s_major_rev_level +0x02
+0x002 s_minor_rev_level +0x02
+0x004 s_mnt_count +0x02
+0x006 s_max_mnt_count +0x02
+0x008 s_state +0x02
+0x00A s_errors +0x02
+0x00C s_checkinterval +0x04
+0x010 s_lastcheck +0x08
+0x018 s_creator_os +0x04
+0x01C s_feature_compat +0x04
+0x020 s_feature_incompat +0x04
+0x024 s_feature_ro_compat +0x04
+0x028 s_root_blkno +0x08
+0x030 s_system_dir_blkno +0x08
+0x038 s_blocksize_bits +0x04
+0x03C s_clustersize_bits +0x04
+0x040 s_max_nodes +0x02
+0x042 s_reserved1 +0x02
+0x044 s_reserved2 +0x04
+0x048 s_first_cluster_group +0x08
+0x050 s_label +0x40
+0x090 s_uuid +0x10
+ Total 0x0A0
-sizeof(ocfs2_local_alloc) = 16
- la_bm_off = 0 (4)
- la_size = 4 (2)
- la_reserved1 = 6 (2)
- la_reserved2 = 8 (8)
- la_bitmap = 16 (0)
+[off] ocfs2_local_alloc [size]
+0x000 la_bm_off +0x04
+0x004 la_size +0x02
+0x006 la_reserved1 +0x02
+0x008 la_reserved2 +0x08
+0x010 la_bitmap +0x00
+ Total 0x010
-sizeof(ocfs2_dinode) = 352
- i_signature = 0 (8)
- i_generation = 8 (4)
- i_suballoc_node = 12 (2)
- i_suballoc_bit = 14 (2)
- i_reserved0 = 16 (4)
- i_clusters = 20 (4)
- i_uid = 24 (4)
- i_gid = 28 (4)
- i_size = 32 (8)
- i_mode = 40 (2)
- i_links_count = 42 (2)
- i_flags = 44 (4)
- i_atime = 48 (8)
- i_ctime = 56 (8)
- i_mtime = 64 (8)
- i_dtime = 72 (8)
- i_blkno = 80 (8)
- i_last_eb_blk = 88 (8)
- i_fs_generation = 96 (4)
- i_reserved1 = 100 (4)
- i_reserved2 = 104 (80)
- id1.i_pad1 = 184 (8)
- id1.dev1.i_rdev = 184 (8)
- id1.bitmap1.i_used = 184 (4)
- id1.bitmap1.i_total = 188 (4)
- id1.journal1.ij_flags = 184 (4)
- id1.journal1.ij_pad = 188 (4)
- id2.i_super = 192 (160)
- id2.i_lab = 192 (16)
- id2.i_chain = 192 (16)
- id2.i_list = 192 (16)
- id2.i_symlink = 192 (0)
+[off] ocfs2_dinode [size]
+0x000 i_signature +0x08
+0x008 i_generation +0x04
+0x00C i_suballoc_node +0x02
+0x00E i_suballoc_bit +0x02
+0x010 i_reserved0 +0x04
+0x014 i_clusters +0x04
+0x018 i_uid +0x04
+0x01C i_gid +0x04
+0x020 i_size +0x08
+0x028 i_mode +0x02
+0x02A i_links_count +0x02
+0x02C i_flags +0x04
+0x030 i_atime +0x08
+0x038 i_ctime +0x08
+0x040 i_mtime +0x08
+0x048 i_dtime +0x08
+0x050 i_blkno +0x08
+0x058 i_last_eb_blk +0x08
+0x060 i_fs_generation +0x04
+0x064 i_reserved1 +0x04
+0x068 i_reserved2 +0x50
+0x0B8 id1.i_pad1 +0x08
+0x0B8 id1.dev1.i_rdev +0x08
+0x0B8 id1.bitmap1.i_used +0x04
+0x0BC id1.bitmap1.i_total +0x04
+0x0B8 id1.journal1.ij_flags +0x04
+0x0BC id1.journal1.ij_pad +0x04
+0x0C0 id2.i_super +0xA0
+0x0C0 id2.i_lab +0x10
+0x0C0 id2.i_chain +0x10
+0x0C0 id2.i_list +0x10
+0x0C0 id2.i_symlink +0x00
+ Total 0x160
-sizeof(struct ocfs2_dir_entry) = 268
- inode = 0 (8)
- rec_len = 8 (2)
- name_len = 10 (1)
- file_type = 11 (1)
- name = 12 (255)
+[off] struct ocfs2_dir_entry [size]
+0x000 inode +0x08
+0x008 rec_len +0x02
+0x00A name_len +0x01
+0x00B file_type +0x01
+0x00C name +0xFF
+ Total 0x10C
-sizeof(ocfs2_group_desc) = 64
- bg_signature = 0 (8)
- bg_size = 8 (2)
- bg_bits = 10 (2)
- bg_free_bits_count = 12 (2)
- bg_chain = 14 (2)
- bg_generation = 16 (4)
- bg_reserved1 = 20 (4)
- bg_next_group = 24 (8)
- bg_parent_dinode = 32 (8)
- bg_blkno = 40 (8)
- bg_reserved2 = 48 (16)
- bg_bitmap = 64 (0)
+[off] ocfs2_group_desc [size]
+0x000 bg_signature +0x08
+0x008 bg_size +0x02
+0x00A bg_bits +0x02
+0x00C bg_free_bits_count +0x02
+0x00E bg_chain +0x02
+0x010 bg_generation +0x04
+0x014 bg_reserved1 +0x04
+0x018 bg_next_group +0x08
+0x020 bg_parent_dinode +0x08
+0x028 bg_blkno +0x08
+0x030 bg_reserved2 +0x10
+0x040 bg_bitmap +0x00
+ Total 0x040
Modified: trunk/sizetest/x86_64.txt
===================================================================
--- trunk/sizetest/x86_64.txt 2005-01-21 02:58:34 UTC (rev 567)
+++ trunk/sizetest/x86_64.txt 2005-01-22 00:56:49 UTC (rev 568)
@@ -1,123 +1,133 @@
-sizeof(ocfs2_extent_rec) = 16
- e_cpos = 0 (4)
- e_clusters = 4 (4)
- e_blkno = 8 (8)
+[off] ocfs2_extent_rec [size]
+0x000 e_cpos +0x04
+0x004 e_clusters +0x04
+0x008 e_blkno +0x08
+ Total 0x010
-sizeof(ocfs2_chain_rec) = 16
- c_free = 0 (4)
- c_total = 4 (4)
- c_blkno = 8 (8)
+[off] ocfs2_chain_rec [size]
+0x000 c_free +0x04
+0x004 c_total +0x04
+0x008 c_blkno +0x08
+ Total 0x010
-sizeof(ocfs2_extent_list) = 16
- l_tree_depth = 0 (2)
- l_count = 2 (2)
- l_next_free_rec = 4 (2)
- l_reserved1 = 6 (2)
- l_reserved2 = 8 (8)
- l_recs = 16 (0)
+[off] ocfs2_extent_list [size]
+0x000 l_tree_depth +0x02
+0x002 l_count +0x02
+0x004 l_next_free_rec +0x02
+0x006 l_reserved1 +0x02
+0x008 l_reserved2 +0x08
+0x010 l_recs +0x00
+ Total 0x010
-sizeof(ocfs2_chain_list) = 16
- cl_cpg = 0 (2)
- cl_bpc = 2 (2)
- cl_count = 4 (2)
- cl_next_free_rec = 6 (2)
- cl_reserved1 = 8 (8)
- cl_recs = 16 (0)
+[off] ocfs2_chain_list [size]
+0x000 cl_cpg +0x02
+0x002 cl_bpc +0x02
+0x004 cl_count +0x02
+0x006 cl_next_free_rec +0x02
+0x008 cl_reserved1 +0x08
+0x010 cl_recs +0x00
+ Total 0x010
-sizeof(ocfs2_extent_block) = 64
- h_signature = 0 (8)
- h_reserved1 = 8 (8)
- h_suballoc_node = 16 (2)
- h_suballoc_bit = 18 (2)
- h_fs_generation = 20 (4)
- h_blkno = 24 (8)
- h_reserved3 = 32 (8)
- h_next_leaf_blk = 40 (8)
- h_list = 48 (16)
+[off] ocfs2_extent_block [size]
+0x000 h_signature +0x08
+0x008 h_reserved1 +0x08
+0x010 h_suballoc_node +0x02
+0x012 h_suballoc_bit +0x02
+0x014 h_fs_generation +0x04
+0x018 h_blkno +0x08
+0x020 h_reserved3 +0x08
+0x028 h_next_leaf_blk +0x08
+0x030 h_list +0x10
+ Total 0x040
-sizeof(ocfs2_super_block) = 160
- s_major_rev_level = 0 (2)
- s_minor_rev_level = 2 (2)
- s_mnt_count = 4 (2)
- s_max_mnt_count = 6 (2)
- s_state = 8 (2)
- s_errors = 10 (2)
- s_checkinterval = 12 (4)
- s_lastcheck = 16 (8)
- s_creator_os = 24 (4)
- s_feature_compat = 28 (4)
- s_feature_incompat = 32 (4)
- s_feature_ro_compat = 36 (4)
- s_root_blkno = 40 (8)
- s_system_dir_blkno = 48 (8)
- s_blocksize_bits = 56 (4)
- s_clustersize_bits = 60 (4)
- s_max_nodes = 64 (2)
- s_reserved1 = 66 (2)
- s_reserved2 = 68 (4)
- s_first_cluster_group = 72 (8)
- s_label = 80 (64)
- s_uuid = 144 (16)
+[off] ocfs2_super_block [size]
+0x000 s_major_rev_level +0x02
+0x002 s_minor_rev_level +0x02
+0x004 s_mnt_count +0x02
+0x006 s_max_mnt_count +0x02
+0x008 s_state +0x02
+0x00A s_errors +0x02
+0x00C s_checkinterval +0x04
+0x010 s_lastcheck +0x08
+0x018 s_creator_os +0x04
+0x01C s_feature_compat +0x04
+0x020 s_feature_incompat +0x04
+0x024 s_feature_ro_compat +0x04
+0x028 s_root_blkno +0x08
+0x030 s_system_dir_blkno +0x08
+0x038 s_blocksize_bits +0x04
+0x03C s_clustersize_bits +0x04
+0x040 s_max_nodes +0x02
+0x042 s_reserved1 +0x02
+0x044 s_reserved2 +0x04
+0x048 s_first_cluster_group +0x08
+0x050 s_label +0x40
+0x090 s_uuid +0x10
+ Total 0x0A0
-sizeof(ocfs2_local_alloc) = 16
- la_bm_off = 0 (4)
- la_size = 4 (2)
- la_reserved1 = 6 (2)
- la_reserved2 = 8 (8)
- la_bitmap = 16 (0)
+[off] ocfs2_local_alloc [size]
+0x000 la_bm_off +0x04
+0x004 la_size +0x02
+0x006 la_reserved1 +0x02
+0x008 la_reserved2 +0x08
+0x010 la_bitmap +0x00
+ Total 0x010
-sizeof(ocfs2_dinode) = 352
- i_signature = 0 (8)
- i_generation = 8 (4)
- i_suballoc_node = 12 (2)
- i_suballoc_bit = 14 (2)
- i_reserved0 = 16 (4)
- i_clusters = 20 (4)
- i_uid = 24 (4)
- i_gid = 28 (4)
- i_size = 32 (8)
- i_mode = 40 (2)
- i_links_count = 42 (2)
- i_flags = 44 (4)
- i_atime = 48 (8)
- i_ctime = 56 (8)
- i_mtime = 64 (8)
- i_dtime = 72 (8)
- i_blkno = 80 (8)
- i_last_eb_blk = 88 (8)
- i_fs_generation = 96 (4)
- i_reserved1 = 100 (4)
- i_reserved2 = 104 (80)
- id1.i_pad1 = 184 (8)
- id1.dev1.i_rdev = 184 (8)
- id1.bitmap1.i_used = 184 (4)
- id1.bitmap1.i_total = 188 (4)
- id1.journal1.ij_flags = 184 (4)
- id1.journal1.ij_pad = 188 (4)
- id2.i_super = 192 (160)
- id2.i_lab = 192 (16)
- id2.i_chain = 192 (16)
- id2.i_list = 192 (16)
- id2.i_symlink = 192 (0)
+[off] ocfs2_dinode [size]
+0x000 i_signature +0x08
+0x008 i_generation +0x04
+0x00C i_suballoc_node +0x02
+0x00E i_suballoc_bit +0x02
+0x010 i_reserved0 +0x04
+0x014 i_clusters +0x04
+0x018 i_uid +0x04
+0x01C i_gid +0x04
+0x020 i_size +0x08
+0x028 i_mode +0x02
+0x02A i_links_count +0x02
+0x02C i_flags +0x04
+0x030 i_atime +0x08
+0x038 i_ctime +0x08
+0x040 i_mtime +0x08
+0x048 i_dtime +0x08
+0x050 i_blkno +0x08
+0x058 i_last_eb_blk +0x08
+0x060 i_fs_generation +0x04
+0x064 i_reserved1 +0x04
+0x068 i_reserved2 +0x50
+0x0B8 id1.i_pad1 +0x08
+0x0B8 id1.dev1.i_rdev +0x08
+0x0B8 id1.bitmap1.i_used +0x04
+0x0BC id1.bitmap1.i_total +0x04
+0x0B8 id1.journal1.ij_flags +0x04
+0x0BC id1.journal1.ij_pad +0x04
+0x0C0 id2.i_super +0xA0
+0x0C0 id2.i_lab +0x10
+0x0C0 id2.i_chain +0x10
+0x0C0 id2.i_list +0x10
+0x0C0 id2.i_symlink +0x00
+ Total 0x160
-sizeof(struct ocfs2_dir_entry) = 272
- inode = 0 (8)
- rec_len = 8 (2)
- name_len = 10 (1)
- file_type = 11 (1)
- name = 12 (255)
+[off] struct ocfs2_dir_entry [size]
+0x000 inode +0x08
+0x008 rec_len +0x02
+0x00A name_len +0x01
+0x00B file_type +0x01
+0x00C name +0xFF
+ Total 0x110
-sizeof(ocfs2_group_desc) = 64
- bg_signature = 0 (8)
- bg_size = 8 (2)
- bg_bits = 10 (2)
- bg_free_bits_count = 12 (2)
- bg_chain = 14 (2)
- bg_generation = 16 (4)
- bg_reserved1 = 20 (4)
- bg_next_group = 24 (8)
- bg_parent_dinode = 32 (8)
- bg_blkno = 40 (8)
- bg_reserved2 = 48 (16)
- bg_bitmap = 64 (0)
+[off] ocfs2_group_desc [size]
+0x000 bg_signature +0x08
+0x008 bg_size +0x02
+0x00A bg_bits +0x02
+0x00C bg_free_bits_count +0x02
+0x00E bg_chain +0x02
+0x010 bg_generation +0x04
+0x014 bg_reserved1 +0x04
+0x018 bg_next_group +0x08
+0x020 bg_parent_dinode +0x08
+0x028 bg_blkno +0x08
+0x030 bg_reserved2 +0x10
+0x040 bg_bitmap +0x00
+ Total 0x040
More information about the Ocfs2-tools-commits
mailing list