[Ocfs2-commits] jlbec commits r1539 - branches/dlm-changes/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-10-01 17:32:04 -0500 (Fri, 01 Oct 2004)
New Revision: 1539

Modified:
   branches/dlm-changes/src/ocfs2_fs.h
Log:

WARNING, big disk change here

o Move ocfs2_dinode fields around a lot.  Because ocfs2_disk_lock has
  a lot of unused space now, move it all into reserved space on the
  ocfs2_dinode, and move fields about to make it coalesce.



Modified: branches/dlm-changes/src/ocfs2_fs.h
===================================================================
--- branches/dlm-changes/src/ocfs2_fs.h	2004-10-01 22:07:13 UTC (rev 1538)
+++ branches/dlm-changes/src/ocfs2_fs.h	2004-10-01 22:32:04 UTC (rev 1539)
@@ -288,12 +288,9 @@
 typedef struct _ocfs2_disk_lock
 {
 /*00*/	__s16 dl_master;	/* Node number of current master */
-	__u16 dl_reserved1;
 	__u8 dl_level;		/* Lock level */
-	__u8 dl_reserved2[3];	/* Pad to u64 */
-	__u64 dl_reserved3;	/* was dl_seq_num */
-/*10*/	__u32 dl_reserved4[8];  /* was dl_node_map */
-/*30*/
+	__u8 dl_reserved1;
+/*04*/
 } ocfs2_disk_lock;
 
 /*
@@ -357,36 +354,33 @@
 					   belongs to */
 	__u16 i_suballoc_bit;		/* Bit offset in suballocater
 					   block group */
-/*10*/	__u64 i_reserved1;
-/*18*/	ocfs2_disk_lock i_disk_lock;	/* Lock structure */
-/*48*/	__u32 i_uid;			/* Owner UID */
+/*10*/	ocfs2_disk_lock i_disk_lock;	/* Lock structure */
+/*14*/	__u32 i_clusters;		/* Cluster count */
+/*18*/	__u32 i_uid;			/* Owner UID */
 	__u32 i_gid;			/* Owning GID */
-/*50*/	__u64 i_size;			/* Size in bytes */
+/*20*/	__u64 i_size;			/* Size in bytes */
 	__u16 i_mode;			/* File mode */
 	__u16 i_links_count;		/* Links count */
 	__u32 i_flags;			/* File flags */
-/*60*/	__u64 i_atime;			/* Access time */
+/*30*/	__u64 i_atime;			/* Access time */
 	__u64 i_ctime;			/* Creation time */
-/*70*/	__u64 i_mtime;			/* Modification time */
+/*40*/	__u64 i_mtime;			/* Modification time */
 	__u64 i_dtime;			/* Deletion time */
-/*80*/	__u64 i_blkno;			/* Offset on disk, in blocks */
-	__u32 i_clusters;		/* Cluster count */
-	__u32 i_reserved2;
-/*90*/	__u64 i_last_eb_blk;		/* Pointer to last extent
+/*50*/	__u64 i_blkno;			/* Offset on disk, in blocks */
+	__u64 i_last_eb_blk;		/* Pointer to last extent
 					   block */
-	__u64 i_reserved3;
-/*A0*/	__u64 i_reserved4;
-	__u64 i_reserved5;
-/*B0*/	__u64 i_reserved6;
-	union {
-		__u64 i_pad1;		/* Generic way to refer to this 64bit
-					   union */
+/*60*/	__u64 i_reserved1[11];
+/*B8*/	union {
+		__u64 i_pad1;		/* Generic way to refer to this
+					   64bit union */
 		struct {
 			__u64 i_rdev;	/* Device number */
 		} dev1;
-		struct {		/* Info for bitmap system inodes */
+		struct {		/* Info for bitmap system
+					   inodes */
 			__u32 i_used;	/* Bits (ie, clusters) used  */
-			__u32 i_total;	/* Total bits (clusters) available */
+			__u32 i_total;	/* Total bits (clusters)
+					   available */
 		} bitmap1;
 	} id1;				/* Inode type dependant 1 */
 /*C0*/	union {