UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://oss.sgi.com/oss/git/xfs/xfs

This commit is contained in:
Felix Blyakher 2009-01-21 22:39:29 -06:00
parent 33ad965dde 5253a11a81
commit 957274d7ce
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/xfs_extfree_item.h
View File

@ -33,12 +33,10 @@ typedef struct xfs_extent {
* conversion routine. * conversion routine.
*/ */
#ifndef HAVE_FORMAT32
typedef struct xfs_extent_32 { typedef struct xfs_extent_32 {
__uint64_t ext_start; __uint64_t ext_start;
__uint32_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 {
__uint64_t ext_start; __uint64_t ext_start;
@ -59,7 +57,6 @@ typedef struct xfs_efi_log_format {
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 {
__uint16_t efi_type; /* efi log item type */ __uint16_t efi_type; /* efi log item type */
__uint16_t efi_size; /* size of this item */ __uint16_t efi_size; /* size of this item */
@ -67,7 +64,6 @@ typedef struct xfs_efi_log_format_32 {
__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 {
__uint16_t efi_type; /* efi log item type */ __uint16_t efi_type; /* efi log item type */
@ -90,7 +86,6 @@ typedef struct xfs_efd_log_format {
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 {
__uint16_t efd_type; /* efd log item type */ __uint16_t efd_type; /* efd log item type */
__uint16_t efd_size; /* size of this item */ __uint16_t efd_size; /* size of this item */
@ -98,7 +93,6 @@ typedef struct xfs_efd_log_format_32 {
__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 {
__uint16_t efd_type; /* efd log item type */ __uint16_t efd_type; /* efd log item type */

2
fs/xfs/xfs_inode_item.h
View File

@ -40,7 +40,6 @@ typedef struct xfs_inode_log_format {
__int32_t 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 {
__uint16_t ilf_type; /* inode log item type */ __uint16_t ilf_type; /* inode log item type */
__uint16_t ilf_size; /* size of this item */ __uint16_t ilf_size; /* size of this item */
@ -56,7 +55,6 @@ typedef struct xfs_inode_log_format_32 {
__int32_t ilf_len; /* len of inode buffer */ __int32_t ilf_len; /* len of inode buffer */
__int32_t ilf_boffset; /* 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 {
__uint16_t ilf_type; /* inode log item type */ __uint16_t ilf_type; /* inode log item type */