Skip to content

Commit

Permalink
[XFS] remove always-true #ifndef HAVE_FORMAT32 tests
Browse files Browse the repository at this point in the history
There are several tests for #ifndef HAVE_FORMAT32, but
this is never defined anywhere so it is always the default
behavior; just remove the ifndef goop.

Signed-off-by: Eric Sandeen <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Lachlan McIlroy <[email protected]>
  • Loading branch information
sandeen authored and Lachlan McIlroy committed Jan 22, 2009
1 parent 55622c6 commit 5253a11
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
6 changes: 0 additions & 6 deletions fs/xfs/xfs_extfree_item.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ typedef struct xfs_extent {
* conversion routine.
*/

#ifndef HAVE_FORMAT32
typedef struct xfs_extent_32 {
__uint64_t ext_start;
__uint32_t ext_len;
} __attribute__((packed)) xfs_extent_32_t;
#endif

typedef struct xfs_extent_64 {
__uint64_t ext_start;
Expand All @@ -59,15 +57,13 @@ typedef struct xfs_efi_log_format {
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 {
__uint16_t efi_type; /* efi log item type */
__uint16_t efi_size; /* size of this item */
__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 {
__uint16_t efi_type; /* efi log item type */
Expand All @@ -90,15 +86,13 @@ typedef struct xfs_efd_log_format {
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 {
__uint16_t efd_type; /* efd log item type */
__uint16_t efd_size; /* size of this item */
__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 {
__uint16_t efd_type; /* efd log item type */
Expand Down
2 changes: 0 additions & 2 deletions fs/xfs/xfs_inode_item.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ typedef struct xfs_inode_log_format {
__int32_t ilf_boffset; /* off of inode in buffer */
} xfs_inode_log_format_t;

#ifndef HAVE_FORMAT32
typedef struct xfs_inode_log_format_32 {
__uint16_t ilf_type; /* inode log item type */
__uint16_t ilf_size; /* size of this item */
Expand All @@ -56,7 +55,6 @@ typedef struct xfs_inode_log_format_32 {
__int32_t ilf_len; /* len of inode 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 {
__uint16_t ilf_type; /* inode log item type */
Expand Down

0 comments on commit 5253a11

Please sign in to comment.