[Ocfs2-tools-commits] mfasheh commits r389 - in trunk: debugfs.ocfs2 libocfs2/include mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-11 15:38:56 -0600 (Thu, 11 Nov 2004)
New Revision: 389

Modified:
   trunk/debugfs.ocfs2/dump.c
   trunk/libocfs2/include/ocfs2_fs.h
   trunk/mkfs.ocfs2/mkfs.c
Log:
* update ocfs2-tools to write out the latest local alloc inode format.



Modified: trunk/debugfs.ocfs2/dump.c
===================================================================
--- trunk/debugfs.ocfs2/dump.c	2004-11-11 20:02:22 UTC (rev 388)
+++ trunk/debugfs.ocfs2/dump.c	2004-11-11 21:38:56 UTC (rev 389)
@@ -81,10 +81,6 @@
 	fprintf(out, "\tLocal Bitmap Offset: %u   Size: %u\n",
 	       loc->la_bm_off, loc->la_size);
 
-	fprintf(out, "\tTotal: %u   Used: %u   Clear: %u\n",
-	       loc->la_bm_bits, loc->la_bits_set,
-	       (loc->la_bm_bits - loc->la_bits_set));
-
 	return ;
 }				/* dump_local_alloc */
 

Modified: trunk/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/libocfs2/include/ocfs2_fs.h	2004-11-11 20:02:22 UTC (rev 388)
+++ trunk/libocfs2/include/ocfs2_fs.h	2004-11-11 21:38:56 UTC (rev 389)
@@ -336,12 +336,9 @@
 typedef struct _ocfs2_local_alloc
 {
 /*00*/	__u32 la_bm_off;	/* Starting bit offset in main bitmap */
-	/* Do we want to use id1.bitmap1? */
-	__u16 la_bm_bits;	/* Number of bits from main bitmap */
-	__u16 la_bits_set;	/* Number of set bits */
 	__u16 la_size;		/* Size of included bitmap, in bytes */
 	__u16 la_reserved1;
-	__u32 la_reserved2;
+	__u64 la_reserved2;
 /*10*/	__u8 la_bitmap[0];
 } ocfs2_local_alloc;
 

Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c	2004-11-11 20:02:22 UTC (rev 388)
+++ trunk/mkfs.ocfs2/mkfs.c	2004-11-11 21:38:56 UTC (rev 389)
@@ -1865,7 +1865,7 @@
 		rec->flags |= OCFS2_JOURNAL_FL;
 		break;
 	case SFI_LOCAL_ALLOC:
-		rec->flags |= OCFS2_LOCAL_ALLOC_FL;
+		rec->flags |= (OCFS2_BITMAP_FL|OCFS2_LOCAL_ALLOC_FL);
 		break;
 	case SFI_DLM:
 		rec->flags |= OCFS2_DLM_FL;