2 files changed, 62 insertions, 54 deletions
diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
index 0ea45edaab03..2f049f63e85f 100644
--- a/fs/xfs/xfs_extfree_item.h
+++ b/fs/xfs/xfs_extfree_item.h
@@ -33,14 +33,16 @@ typedef struct xfs_extent {
 * conversion routine.
 */
+#ifndef HAVE_FORMAT32
 typedef struct xfs_extent_32 {
-        xfs_dfsbno_t    ext_start;
+        __uint64_t      ext_start;
-        xfs_extlen_t    ext_len;
+        __uint32_t      ext_len;
 } __attribute__((packed)) xfs_extent_32_t;
+#endif
 typedef struct xfs_extent_64 {
-        xfs_dfsbno_t    ext_start;
+        __uint64_t      ext_start;
-        xfs_extlen_t    ext_len;
+        __uint32_t      ext_len;
        __uint32_t      ext_pad;
 } xfs_extent_64_t;
@@ -50,25 +52,27 @@ typedef struct xfs_extent_64 {
 * size is given by efi_nextents.
 */
 typedef struct xfs_efi_log_format {
-        unsigned short          efi_type;       /* efi log item type */
+        __uint16_t              efi_type;       /* efi log item type */
-        unsigned short          efi_size;       /* size of this item */
+        __uint16_t              efi_size;       /* size of this item */
-        uint                    efi_nextents;   /* # extents to free */
+        __uint32_t              efi_nextents;   /* # extents to free */
        __uint64_t              efi_id;         /* efi identifier */
        xfs_extent_t            efi_extents[1]; /* array of extents to free */
 } xfs_efi_log_format_t;
+#ifndef HAVE_FORMAT32
 typedef struct xfs_efi_log_format_32 {
-        unsigned short          efi_type;       /* efi log item type */
+        __uint16_t              efi_type;       /* efi log item type */
-        unsigned short          efi_size;       /* size of this item */
+        __uint16_t              efi_size;       /* size of this item */
-        uint                    efi_nextents;   /* # extents to free */
+        __uint32_t              efi_nextents;   /* # extents to free */
        __uint64_t              efi_id;         /* efi identifier */
        xfs_extent_32_t         efi_extents[1]; /* array of extents to free */
 } __attribute__((packed)) xfs_efi_log_format_32_t;
+#endif
 typedef struct xfs_efi_log_format_64 {
-        unsigned short          efi_type;       /* efi log item type */
+        __uint16_t              efi_type;       /* efi log item type */
-        unsigned short          efi_size;       /* size of this item */
+        __uint16_t              efi_size;       /* size of this item */
-        uint                    efi_nextents;   /* # extents to free */
+        __uint32_t              efi_nextents;   /* # extents to free */
        __uint64_t              efi_id;         /* efi identifier */
        xfs_extent_64_t         efi_extents[1]; /* array of extents to free */
 } xfs_efi_log_format_64_t;
@@ -79,25 +83,27 @@ typedef struct xfs_efi_log_format_64 {
 * size is given by efd_nextents;
 */
 typedef struct xfs_efd_log_format {
-        unsigned short          efd_type;       /* efd log item type */
+        __uint16_t              efd_type;       /* efd log item type */
-        unsigned short          efd_size;       /* size of this item */
+        __uint16_t              efd_size;       /* size of this item */
-        uint                    efd_nextents;   /* # of extents freed */
+        __uint32_t              efd_nextents;   /* # of extents freed */
        __uint64_t              efd_efi_id;     /* id of corresponding efi */
        xfs_extent_t            efd_extents[1]; /* array of extents freed */
 } xfs_efd_log_format_t;
+#ifndef HAVE_FORMAT32
 typedef struct xfs_efd_log_format_32 {
-        unsigned short          efd_type;       /* efd log item type */
+        __uint16_t              efd_type;       /* efd log item type */
-        unsigned short          efd_size;       /* size of this item */
+        __uint16_t              efd_size;       /* size of this item */
-        uint                    efd_nextents;   /* # of extents freed */
+        __uint32_t              efd_nextents;   /* # of extents freed */
        __uint64_t              efd_efi_id;     /* id of corresponding efi */
        xfs_extent_32_t         efd_extents[1]; /* array of extents freed */
 } __attribute__((packed)) xfs_efd_log_format_32_t;
+#endif
 typedef struct xfs_efd_log_format_64 {
-        unsigned short          efd_type;       /* efd log item type */
+        __uint16_t              efd_type;       /* efd log item type */
-        unsigned short          efd_size;       /* size of this item */
+        __uint16_t              efd_size;       /* size of this item */
-        uint                    efd_nextents;   /* # of extents freed */
+        __uint32_t              efd_nextents;   /* # of extents freed */
        __uint64_t              efd_efi_id;     /* id of corresponding efi */
        xfs_extent_64_t         efd_extents[1]; /* array of extents freed */
 } xfs_efd_log_format_64_t;
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
index 5db6cd1b4cf3..bfe92ea17952 100644
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/xfs_inode_item.h
@@ -25,52 +25,54 @@
 * must be added on to the end.
 */
 typedef struct xfs_inode_log_format {
-        unsigned short          ilf_type;       /* inode log item type */
+        __uint16_t              ilf_type;       /* inode log item type */
-        unsigned short          ilf_size;       /* size of this item */
+        __uint16_t              ilf_size;       /* size of this item */
-        uint                    ilf_fields;     /* flags for fields logged */
+        __uint32_t              ilf_fields;     /* flags for fields logged */
-        ushort                  ilf_asize;      /* size of attr d/ext/root */
+        __uint16_t              ilf_asize;      /* size of attr d/ext/root */
-        ushort                  ilf_dsize;      /* size of data/ext/root */
+        __uint16_t              ilf_dsize;      /* size of data/ext/root */
-        xfs_ino_t               ilf_ino;        /* inode number */
+        __uint64_t              ilf_ino;        /* inode number */
        union {
-                xfs_dev_t       ilfu_rdev;      /* rdev value for dev inode*/
+                __uint32_t      ilfu_rdev;      /* rdev value for dev inode*/
                uuid_t          ilfu_uuid;      /* mount point value */
        } ilf_u;
        __int64_t               ilf_blkno;      /* blkno of inode buffer */
-        int                     ilf_len;        /* len of inode buffer */
+        __int32_t               ilf_len;        /* len of inode buffer */
-        int                     ilf_boffset;    /* off of inode in buffer */
+        __int32_t               ilf_boffset;    /* off of inode in buffer */
 } xfs_inode_log_format_t;
+#ifndef HAVE_FORMAT32
 typedef struct xfs_inode_log_format_32 {
-        unsigned short          ilf_type;       /* 16: inode log item type */
+        __uint16_t              ilf_type;       /* inode log item type */
-        unsigned short          ilf_size;       /* 16: size of this item */
+        __uint16_t              ilf_size;       /* size of this item */
-        uint                    ilf_fields;     /* 32: flags for fields logged */
+        __uint32_t              ilf_fields;     /* flags for fields logged */
-        ushort                  ilf_asize;      /* 32: size of attr d/ext/root */
+        __uint16_t              ilf_asize;      /* size of attr d/ext/root */
-        ushort                  ilf_dsize;      /* 32: size of data/ext/root */
+        __uint16_t              ilf_dsize;      /* size of data/ext/root */
-        xfs_ino_t               ilf_ino;        /* 64: inode number */
+        __uint64_t              ilf_ino;        /* inode number */
        union {
-                xfs_dev_t       ilfu_rdev;      /* 32: rdev value for dev inode*/
+                __uint32_t      ilfu_rdev;      /* rdev value for dev inode*/
-                uuid_t          ilfu_uuid;      /* 128: mount point value */
+                uuid_t          ilfu_uuid;      /* mount point value */
        } ilf_u;
-        __int64_t               ilf_blkno;      /* 64: blkno of inode buffer */
+        __int64_t               ilf_blkno;      /* blkno of inode buffer */
-        int                     ilf_len;        /* 32: len of inode buffer */
+        __int32_t               ilf_len;        /* len of inode buffer */
-        int                     ilf_boffset;    /* 32: off of inode in buffer */
+        __int32_t               ilf_boffset;    /* off of inode in buffer */
 } __attribute__((packed)) xfs_inode_log_format_32_t;
+#endif
 typedef struct xfs_inode_log_format_64 {
-        unsigned short          ilf_type;       /* 16: inode log item type */
+        __uint16_t              ilf_type;       /* inode log item type */
-        unsigned short          ilf_size;       /* 16: size of this item */
+        __uint16_t              ilf_size;       /* size of this item */
-        uint                    ilf_fields;     /* 32: flags for fields logged */
+        __uint32_t              ilf_fields;     /* flags for fields logged */
-        ushort                  ilf_asize;      /* 32: size of attr d/ext/root */
+        __uint16_t              ilf_asize;      /* size of attr d/ext/root */
-        ushort                  ilf_dsize;      /* 32: size of data/ext/root */
+        __uint16_t              ilf_dsize;      /* size of data/ext/root */
-        __uint32_t              ilf_pad;        /* 32: pad for 64 bit boundary */
+        __uint32_t              ilf_pad;        /* pad for 64 bit boundary */
-        xfs_ino_t               ilf_ino;        /* 64: inode number */
+        __uint64_t              ilf_ino;        /* inode number */
        union {
-                xfs_dev_t       ilfu_rdev;      /* 32: rdev value for dev inode*/
+                __uint32_t      ilfu_rdev;      /* rdev value for dev inode*/
-                uuid_t          ilfu_uuid;      /* 128: mount point value */
+                uuid_t          ilfu_uuid;      /* mount point value */
        } ilf_u;
-        __int64_t               ilf_blkno;      /* 64: blkno of inode buffer */
+        __int64_t               ilf_blkno;      /* blkno of inode buffer */
-        int                     ilf_len;        /* 32: len of inode buffer */
+        __int32_t               ilf_len;        /* len of inode buffer */
-        int                     ilf_boffset;    /* 32: off of inode in buffer */
+        __int32_t               ilf_boffset;    /* off of inode in buffer */
 } xfs_inode_log_format_64_t;
 /*

diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h index 0ea45edaab03..2f049f63e85f 100644 --- a/fs/xfs/xfs_extfree_item.h +++ b/fs/xfs/xfs_extfree_item.h
@@ -33,14 +33,16 @@ typedef struct xfs_extent {
33	* conversion routine.	33	* conversion routine.
34	*/	34	*/
35		35
		36	#ifndef HAVE_FORMAT32
36	typedef struct xfs_extent_32 {	37	typedef struct xfs_extent_32 {
37	xfs_dfsbno_t ext_start;	38	__uint64_t ext_start;
38	xfs_extlen_t ext_len;	39	__uint32_t ext_len;
39	} __attribute__((packed)) xfs_extent_32_t;	40	} __attribute__((packed)) xfs_extent_32_t;
		41	#endif
40		42
41	typedef struct xfs_extent_64 {	43	typedef struct xfs_extent_64 {
42	xfs_dfsbno_t ext_start;	44	__uint64_t ext_start;
43	xfs_extlen_t ext_len;	45	__uint32_t ext_len;
44	__uint32_t ext_pad;	46	__uint32_t ext_pad;
45	} xfs_extent_64_t;	47	} xfs_extent_64_t;
46		48
@@ -50,25 +52,27 @@ typedef struct xfs_extent_64 {
50	* size is given by efi_nextents.	52	* size is given by efi_nextents.
51	*/	53	*/
52	typedef struct xfs_efi_log_format {	54	typedef struct xfs_efi_log_format {
53	unsigned short efi_type; /* efi log item type */	55	__uint16_t efi_type; /* efi log item type */
54	unsigned short efi_size; /* size of this item */	56	__uint16_t efi_size; /* size of this item */
55	uint efi_nextents; /* # extents to free */	57	__uint32_t efi_nextents; /* # extents to free */
56	__uint64_t efi_id; /* efi identifier */	58	__uint64_t efi_id; /* efi identifier */
57	xfs_extent_t efi_extents[1]; /* array of extents to free */	59	xfs_extent_t efi_extents[1]; /* array of extents to free */
58	} xfs_efi_log_format_t;	60	} xfs_efi_log_format_t;
59		61
		62	#ifndef HAVE_FORMAT32
60	typedef struct xfs_efi_log_format_32 {	63	typedef struct xfs_efi_log_format_32 {
61	unsigned short efi_type; /* efi log item type */	64	__uint16_t efi_type; /* efi log item type */
62	unsigned short efi_size; /* size of this item */	65	__uint16_t efi_size; /* size of this item */
63	uint efi_nextents; /* # extents to free */	66	__uint32_t efi_nextents; /* # extents to free */
64	__uint64_t efi_id; /* efi identifier */	67	__uint64_t efi_id; /* efi identifier */
65	xfs_extent_32_t efi_extents[1]; /* array of extents to free */	68	xfs_extent_32_t efi_extents[1]; /* array of extents to free */
66	} __attribute__((packed)) xfs_efi_log_format_32_t;	69	} __attribute__((packed)) xfs_efi_log_format_32_t;
		70	#endif
67		71
68	typedef struct xfs_efi_log_format_64 {	72	typedef struct xfs_efi_log_format_64 {
69	unsigned short efi_type; /* efi log item type */	73	__uint16_t efi_type; /* efi log item type */
70	unsigned short efi_size; /* size of this item */	74	__uint16_t efi_size; /* size of this item */
71	uint efi_nextents; /* # extents to free */	75	__uint32_t efi_nextents; /* # extents to free */
72	__uint64_t efi_id; /* efi identifier */	76	__uint64_t efi_id; /* efi identifier */
73	xfs_extent_64_t efi_extents[1]; /* array of extents to free */	77	xfs_extent_64_t efi_extents[1]; /* array of extents to free */
74	} xfs_efi_log_format_64_t;	78	} xfs_efi_log_format_64_t;
@@ -79,25 +83,27 @@ typedef struct xfs_efi_log_format_64 {
79	* size is given by efd_nextents;	83	* size is given by efd_nextents;
80	*/	84	*/
81	typedef struct xfs_efd_log_format {	85	typedef struct xfs_efd_log_format {
82	unsigned short efd_type; /* efd log item type */	86	__uint16_t efd_type; /* efd log item type */
83	unsigned short efd_size; /* size of this item */	87	__uint16_t efd_size; /* size of this item */
84	uint efd_nextents; /* # of extents freed */	88	__uint32_t efd_nextents; /* # of extents freed */
85	__uint64_t efd_efi_id; /* id of corresponding efi */	89	__uint64_t efd_efi_id; /* id of corresponding efi */
86	xfs_extent_t efd_extents[1]; /* array of extents freed */	90	xfs_extent_t efd_extents[1]; /* array of extents freed */
87	} xfs_efd_log_format_t;	91	} xfs_efd_log_format_t;
88		92
		93	#ifndef HAVE_FORMAT32
89	typedef struct xfs_efd_log_format_32 {	94	typedef struct xfs_efd_log_format_32 {
90	unsigned short efd_type; /* efd log item type */	95	__uint16_t efd_type; /* efd log item type */
91	unsigned short efd_size; /* size of this item */	96	__uint16_t efd_size; /* size of this item */
92	uint efd_nextents; /* # of extents freed */	97	__uint32_t efd_nextents; /* # of extents freed */
93	__uint64_t efd_efi_id; /* id of corresponding efi */	98	__uint64_t efd_efi_id; /* id of corresponding efi */
94	xfs_extent_32_t efd_extents[1]; /* array of extents freed */	99	xfs_extent_32_t efd_extents[1]; /* array of extents freed */
95	} __attribute__((packed)) xfs_efd_log_format_32_t;	100	} __attribute__((packed)) xfs_efd_log_format_32_t;
		101	#endif
96		102
97	typedef struct xfs_efd_log_format_64 {	103	typedef struct xfs_efd_log_format_64 {
98	unsigned short efd_type; /* efd log item type */	104	__uint16_t efd_type; /* efd log item type */
99	unsigned short efd_size; /* size of this item */	105	__uint16_t efd_size; /* size of this item */
100	uint efd_nextents; /* # of extents freed */	106	__uint32_t efd_nextents; /* # of extents freed */
101	__uint64_t efd_efi_id; /* id of corresponding efi */	107	__uint64_t efd_efi_id; /* id of corresponding efi */
102	xfs_extent_64_t efd_extents[1]; /* array of extents freed */	108	xfs_extent_64_t efd_extents[1]; /* array of extents freed */
103	} xfs_efd_log_format_64_t;	109	} xfs_efd_log_format_64_t;


diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h index 5db6cd1b4cf3..bfe92ea17952 100644 --- a/fs/xfs/xfs_inode_item.h +++ b/fs/xfs/xfs_inode_item.h
@@ -25,52 +25,54 @@
25	* must be added on to the end.	25	* must be added on to the end.
26	*/	26	*/
27	typedef struct xfs_inode_log_format {	27	typedef struct xfs_inode_log_format {
28	unsigned short ilf_type; /* inode log item type */	28	__uint16_t ilf_type; /* inode log item type */
29	unsigned short ilf_size; /* size of this item */	29	__uint16_t ilf_size; /* size of this item */
30	uint ilf_fields; /* flags for fields logged */	30	__uint32_t ilf_fields; /* flags for fields logged */
31	ushort ilf_asize; /* size of attr d/ext/root */	31	__uint16_t ilf_asize; /* size of attr d/ext/root */
32	ushort ilf_dsize; /* size of data/ext/root */	32	__uint16_t ilf_dsize; /* size of data/ext/root */
33	xfs_ino_t ilf_ino; /* inode number */	33	__uint64_t ilf_ino; /* inode number */
34	union {	34	union {
35	xfs_dev_t ilfu_rdev; /* rdev value for dev inode*/	35	__uint32_t ilfu_rdev; /* rdev value for dev inode*/
36	uuid_t ilfu_uuid; /* mount point value */	36	uuid_t ilfu_uuid; /* mount point value */
37	} ilf_u;	37	} ilf_u;
38	__int64_t ilf_blkno; /* blkno of inode buffer */	38	__int64_t ilf_blkno; /* blkno of inode buffer */
39	int ilf_len; /* len of inode buffer */	39	__int32_t ilf_len; /* len of inode buffer */
40	int ilf_boffset; /* off of inode in buffer */	40	__int32_t ilf_boffset; /* off of inode in buffer */
41	} xfs_inode_log_format_t;	41	} xfs_inode_log_format_t;
42		42
		43	#ifndef HAVE_FORMAT32
43	typedef struct xfs_inode_log_format_32 {	44	typedef struct xfs_inode_log_format_32 {
44	unsigned short ilf_type; /* 16: inode log item type */	45	__uint16_t ilf_type; /* inode log item type */
45	unsigned short ilf_size; /* 16: size of this item */	46	__uint16_t ilf_size; /* size of this item */
46	uint ilf_fields; /* 32: flags for fields logged */	47	__uint32_t ilf_fields; /* flags for fields logged */
47	ushort ilf_asize; /* 32: size of attr d/ext/root */	48	__uint16_t ilf_asize; /* size of attr d/ext/root */
48	ushort ilf_dsize; /* 32: size of data/ext/root */	49	__uint16_t ilf_dsize; /* size of data/ext/root */
49	xfs_ino_t ilf_ino; /* 64: inode number */	50	__uint64_t ilf_ino; /* inode number */
50	union {	51	union {
51	xfs_dev_t ilfu_rdev; /* 32: rdev value for dev inode*/	52	__uint32_t ilfu_rdev; /* rdev value for dev inode*/
52	uuid_t ilfu_uuid; /* 128: mount point value */	53	uuid_t ilfu_uuid; /* mount point value */
53	} ilf_u;	54	} ilf_u;
54	__int64_t ilf_blkno; /* 64: blkno of inode buffer */	55	__int64_t ilf_blkno; /* blkno of inode buffer */
55	int ilf_len; /* 32: len of inode buffer */	56	__int32_t ilf_len; /* len of inode buffer */
56	int ilf_boffset; /* 32: off of inode in buffer */	57	__int32_t ilf_boffset; /* off of inode in buffer */
57	} __attribute__((packed)) xfs_inode_log_format_32_t;	58	} __attribute__((packed)) xfs_inode_log_format_32_t;
		59	#endif
58		60
59	typedef struct xfs_inode_log_format_64 {	61	typedef struct xfs_inode_log_format_64 {
60	unsigned short ilf_type; /* 16: inode log item type */	62	__uint16_t ilf_type; /* inode log item type */
61	unsigned short ilf_size; /* 16: size of this item */	63	__uint16_t ilf_size; /* size of this item */
62	uint ilf_fields; /* 32: flags for fields logged */	64	__uint32_t ilf_fields; /* flags for fields logged */
63	ushort ilf_asize; /* 32: size of attr d/ext/root */	65	__uint16_t ilf_asize; /* size of attr d/ext/root */
64	ushort ilf_dsize; /* 32: size of data/ext/root */	66	__uint16_t ilf_dsize; /* size of data/ext/root */
65	__uint32_t ilf_pad; /* 32: pad for 64 bit boundary */	67	__uint32_t ilf_pad; /* pad for 64 bit boundary */
66	xfs_ino_t ilf_ino; /* 64: inode number */	68	__uint64_t ilf_ino; /* inode number */
67	union {	69	union {
68	xfs_dev_t ilfu_rdev; /* 32: rdev value for dev inode*/	70	__uint32_t ilfu_rdev; /* rdev value for dev inode*/
69	uuid_t ilfu_uuid; /* 128: mount point value */	71	uuid_t ilfu_uuid; /* mount point value */
70	} ilf_u;	72	} ilf_u;
71	__int64_t ilf_blkno; /* 64: blkno of inode buffer */	73	__int64_t ilf_blkno; /* blkno of inode buffer */
72	int ilf_len; /* 32: len of inode buffer */	74	__int32_t ilf_len; /* len of inode buffer */
73	int ilf_boffset; /* 32: off of inode in buffer */	75	__int32_t ilf_boffset; /* off of inode in buffer */
74	} xfs_inode_log_format_64_t;	76	} xfs_inode_log_format_64_t;
75		77
76	/*	78	/*