[PATCH] struct sizes in jfs_txnmgr.h and jfs_logmgr.h

[email protected] Sun, 3 Aug 2003 13:41:44 -0400
Newsgroups gmane.comp.file-systems.jfs.patches
Message-ID <20030803174144.GA26817@rushmore>
A couple comments on struct sizes appear out of date.
sizeof's from x86.

--- linux-2.6.0-test2-bk3/fs/jfs/jfs_txnmgr.h.orig      2002-09-17 20:26:52.000000000 -0400
+++ linux-2.6.0-test2-bk3/fs/jfs/jfs_txnmgr.h   2003-08-03 12:49:15.000000000 -0400
@@ -99,10 +99,10 @@

        struct metapage *mp;    /* 4: object page buffer locked */
        struct inode *ip;       /* 4: object */
-       /* (16) */
+       /* (20) */

        s16 lock[24];           /* 48: overlay area */
-};                             /* (64) */
+};                             /* (68) */

 extern struct tlock *TxLock;   /* transaction lock table */

@@ -276,7 +276,7 @@

        /* log record descriptor on 64-bit boundary */
        struct lrd lrd;         /* : log record descriptor */
-};
+};                             /* 60 */

 /*
  * external declarations

--- linux-2.6.0-test2-bk3/fs/jfs/jfs_logmgr.h.orig	2003-07-10 19:57:31.000000000 -0400
+++ linux-2.6.0-test2-bk3/fs/jfs/jfs_logmgr.h	2003-08-03 13:29:12.000000000 -0400
@@ -382,7 +382,7 @@
 	long flag;		/* 4: flag */
 
 	struct lbuf *lbuf_free;	/* 4: free lbufs */
-	wait_queue_head_t free_wait;	/* 4: */
+	wait_queue_head_t free_wait;	/* 12: */
 
 	/* log write */
 	int logtid;		/* 4: log tid */
@@ -390,12 +390,12 @@
 	int eor;		/* 4: eor of last record in eol page */
 	struct lbuf *bp;	/* 4: current log page buffer */
 
-	struct semaphore loglock;	/* 4: log write serialization lock */
+	struct semaphore loglock;	/* 20: log write serialization lock */
 
 	/* syncpt */
 	int nextsync;		/* 4: bytes to write before next syncpt */
 	int active;		/* 4: */
-	wait_queue_head_t syncwait;	/* 4: */
+	wait_queue_head_t syncwait;	/* 12: */
 
 	/* commit */
 	uint cflag;		/* 4: */
@@ -418,10 +418,10 @@
 	int count;		/* 4: count */
 	char uuid[16];		/* 16: 128-bit uuid of log device */
 
-	int no_integrity;	/* 3: flag to disable journaling to disk */
+	int no_integrity;	/* 4: flag to disable journaling to disk */
 	int ni_page;		/* 4: backup of page for nointegrity option */
 	int ni_eor;		/* 4: backup of eor for nointegrity option */
-};
+};				/* 200 */
 
 /*
  * Log flag
@@ -470,9 +470,9 @@
 	s64 l_blkno;		/* 8: log page block number */
 	caddr_t l_ldata;	/* 4: data page */
 
-	wait_queue_head_t l_ioevent;	/* 4: i/o done event */
+	wait_queue_head_t l_ioevent;	/* 12: i/o done event */
 	struct page *l_page;	/* The page itself */
-};
+};				/* 56 */
 
 /* Reuse l_freelist for redrive list */
 #define l_redrive_next l_freelist
@@ -488,7 +488,7 @@
 	lid_t lid;		/* lock id */
 	s32 lsn;		/* log sequence number */
 	struct list_head synclist;	/* log sync list link */
-};
+};				/* 20 */
 
 /*
  *	logsynclist serialization (per log)

-- 
Randy Hron
http://home.earthlink.net/~rwhron/kernel/bigbox.html