Skip to content

L
linux-davinci
Commit 128dabc5 authored by Tim Shimmin's avatar Tim Shimmin
Browse files
Options

[XFS] cleanup the field types of some item format structures 

SGI-PV: 954365
SGI-Modid: xfs-linux-melb:xfs-kern:26406a
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent f07c2250
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 54 deletions
fs/xfs/xfs_extfree_item.h
View file @ 128dabc5
...@@ -33,14 +33,16 @@ typedef struct xfs_extent { ...@@ -33,14 +33,16 @@ typedef struct xfs_extent {
* conversion routine. * conversion routine.
*/ */
#ifndef HAVE_FORMAT32
typedef struct xfs_extent_32 { 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; } __attribute__((packed)) xfs_extent_32_t;
#endif
typedef struct xfs_extent_64 { 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; __uint32_t ext_pad;
} xfs_extent_64_t; } xfs_extent_64_t;
...@@ -50,25 +52,27 @@ typedef struct xfs_extent_64 { ...@@ -50,25 +52,27 @@ typedef struct xfs_extent_64 {
* size is given by efi_nextents. * size is given by efi_nextents.
*/ */
typedef struct xfs_efi_log_format { 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 */ __uint64_t efi_id; /* efi identifier */
xfs_extent_t efi_extents[1]; /* array of extents to free */ xfs_extent_t efi_extents[1]; /* array of extents to free */
} xfs_efi_log_format_t; } xfs_efi_log_format_t;
#ifndef HAVE_FORMAT32
typedef struct xfs_efi_log_format_32 { 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 */ __uint64_t efi_id; /* efi identifier */
xfs_extent_32_t efi_extents[1]; /* array of extents to free */ xfs_extent_32_t efi_extents[1]; /* array of extents to free */
} __attribute__((packed)) xfs_efi_log_format_32_t; } __attribute__((packed)) xfs_efi_log_format_32_t;
#endif
typedef struct xfs_efi_log_format_64 { 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 */ __uint64_t efi_id; /* efi identifier */
xfs_extent_64_t efi_extents[1]; /* array of extents to free */ xfs_extent_64_t efi_extents[1]; /* array of extents to free */
} xfs_efi_log_format_64_t; } xfs_efi_log_format_64_t;
...@@ -79,25 +83,27 @@ typedef struct xfs_efi_log_format_64 { ...@@ -79,25 +83,27 @@ typedef struct xfs_efi_log_format_64 {
* size is given by efd_nextents; * size is given by efd_nextents;
*/ */
typedef struct xfs_efd_log_format { 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 */ __uint64_t efd_efi_id; /* id of corresponding efi */
xfs_extent_t efd_extents[1]; /* array of extents freed */ xfs_extent_t efd_extents[1]; /* array of extents freed */
} xfs_efd_log_format_t; } xfs_efd_log_format_t;
#ifndef HAVE_FORMAT32
typedef struct xfs_efd_log_format_32 { 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 */ __uint64_t efd_efi_id; /* id of corresponding efi */
xfs_extent_32_t efd_extents[1]; /* array of extents freed */ xfs_extent_32_t efd_extents[1]; /* array of extents freed */
} __attribute__((packed)) xfs_efd_log_format_32_t; } __attribute__((packed)) xfs_efd_log_format_32_t;
#endif
typedef struct xfs_efd_log_format_64 { 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 */ __uint64_t efd_efi_id; /* id of corresponding efi */
xfs_extent_64_t efd_extents[1]; /* array of extents freed */ xfs_extent_64_t efd_extents[1]; /* array of extents freed */
} xfs_efd_log_format_64_t; } xfs_efd_log_format_64_t;
......
fs/xfs/xfs_inode_item.h
View file @ 128dabc5
...@@ -25,52 +25,54 @@ ...@@ -25,52 +25,54 @@
* must be added on to the end. * must be added on to the end.
*/ */
typedef struct xfs_inode_log_format { 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 { 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 */ uuid_t ilfu_uuid; /* mount point value */
} ilf_u; } ilf_u;
__int64_t ilf_blkno; /* blkno of inode buffer */ __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; } xfs_inode_log_format_t;
#ifndef HAVE_FORMAT32
typedef struct xfs_inode_log_format_32 { 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 { 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; } 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; } __attribute__((packed)) xfs_inode_log_format_32_t;
#endif
typedef struct xfs_inode_log_format_64 { 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 { 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; } 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; } xfs_inode_log_format_64_t;
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment