[Ocfs2-tools-commits] jlbec commits r266 - in branches/dlm-changes: debugfs.ocfs2 libocfs2/include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-09-27 12:22:24 -0500 (Mon, 27 Sep 2004)
New Revision: 266

Modified:
   branches/dlm-changes/debugfs.ocfs2/dump.c
   branches/dlm-changes/libocfs2/include/ocfs2_fs.h
Log:
waka waka waka

Modified: branches/dlm-changes/debugfs.ocfs2/dump.c
===================================================================
--- branches/dlm-changes/debugfs.ocfs2/dump.c	2004-09-27 06:53:35 UTC (rev 265)
+++ branches/dlm-changes/debugfs.ocfs2/dump.c	2004-09-27 17:22:24 UTC (rev 266)
@@ -162,8 +162,8 @@
 	fprintf(out, "\tdtime: 0x%llx -- %s", (unsigned long long)in->i_dtime, str);
 
 	fprintf(out, "\tLast Extblk: %llu\n", (unsigned long long)in->i_last_eb_blk);
-	fprintf(out, "\tSub Alloc Node: %u   Sub Alloc Blknum: %llu\n",
-	       in->i_suballoc_node, (unsigned long long)in->i_suballoc_blkno);
+	fprintf(out, "\tSub Alloc Node: %u   Sub Alloc Bit: %u\n",
+	       in->i_suballoc_node, in->i_suballoc_bit);
 
 	if (in->i_flags & OCFS2_BITMAP_FL)
 		fprintf(out, "\tBitmap Total: %u   Used: %u   Clear: %u\n",
@@ -244,8 +244,8 @@
  */
 void dump_extent_block (FILE *out, ocfs2_extent_block *blk)
 {
-	fprintf (out, "\tSubAlloc Blknum: %llu   SubAlloc Node: %u\n",
-		 (unsigned long long)blk->h_suballoc_blkno, blk->h_suballoc_node);
+	fprintf (out, "\tSubAlloc Bit: %u   SubAlloc Node: %u\n",
+		 blk->h_suballoc_bit, blk->h_suballoc_node);
 
 	fprintf (out, "\tBlknum: %llu   Parent: %llu   Next Leaf: %llu\n",
 		 (unsigned long long)blk->h_blkno,

Modified: branches/dlm-changes/libocfs2/include/ocfs2_fs.h
===================================================================
--- branches/dlm-changes/libocfs2/include/ocfs2_fs.h	2004-09-27 06:53:35 UTC (rev 265)
+++ branches/dlm-changes/libocfs2/include/ocfs2_fs.h	2004-09-27 17:22:24 UTC (rev 266)
@@ -227,9 +227,9 @@
 } ocfs2_extent_rec;	
 
 typedef struct _ocfs2_chain_rec {
-	__u32 c_free;       /* number of free bits in this chain. */
-	__u32 c_total;
-	__u64 c_blkno;      /* Physical disk offset (blocks) of 1st group */
+	__u32 c_free;	/* Number of free bits in this chain. */
+	__u32 c_total;	/* Number of total bits in this chain */
+	__u64 c_blkno;	/* Physical disk offset (blocks) of 1st group */
 } ocfs2_chain_rec;
 
 /*
@@ -251,13 +251,18 @@
 /*10*/	ocfs2_extent_rec l_recs[0];	/* Extent records */
 } ocfs2_extent_list;
 
+/*
+ * On disk allocation chain list for OCFS2.  Note that this is
+ * contained inside ocfs2_dinode, so the offsets are relative to
+ * ocfs2_dinode.id2.i_chain.
+ */
 typedef struct _ocfs2_chain_list {
-	__u16 cl_cpg;		/* Clusters per Block Group */
-	__u16 cl_bpc;		/* Bits per cluster */
-	__u16 cl_count;
-	__u16 cl_next_free_rec;
+/*00*/	__u16 cl_cpg;			/* Clusters per Block Group */
+	__u16 cl_bpc;			/* Bits per cluster */
+	__u16 cl_count;			/* Total chains in this list */
+	__u16 cl_next_free_rec;		/* Next unused chain slot */
 	__u64 cl_reserved1;
-	ocfs2_chain_rec cl_recs[0];
+/*10*/	ocfs2_chain_rec cl_recs[0];	/* Chain records */
 } ocfs2_chain_list;
 
 /*
@@ -417,16 +422,21 @@
 typedef struct _ocfs2_group_desc
 {
 /*00*/	__u8    bg_signature[8];        /* Signature for validation */
-	__u16   bg_size;                /* Size of included bitmap in bytes. */
-	__u16   bg_bits;                /* Bits represented by this group. */
+	__u16   bg_size;                /* Size of included bitmap in
+					   bytes. */
+	__u16   bg_bits;                /* Bits represented by this
+					   group. */
 	__u16	bg_free_bits_count;     /* Free bits count */
 	__u16   bg_chain;               /* What chain I am in. */
-	__u32   bg_generation;
-	__u64   bg_next_group;          /* Next group in my list, in blocks */
-	__u64   bg_parent_dinode;       /* dinode which owns me, in blocks */
+/*10*/	__u32   bg_generation;
+	__u32	bg_reserved1;
+	__u64   bg_next_group;          /* Next group in my list, in
+					   blocks */
+/*20*/	__u64   bg_parent_dinode;       /* dinode which owns me, in
+					   blocks */
 	__u64   bg_blkno;               /* Offset on disk, in blocks */
-	__u64   bg_reserved2[2];
-	__u8    bg_bitmap[0];
+/*30*/	__u64   bg_reserved2[2];
+/*40*/	__u8    bg_bitmap[0];
 } ocfs2_group_desc;
 
 #ifdef __KERNEL__