2008-04-18 19:21:00

by Eric Sandeen

[permalink] [raw]
Subject: [PATCH V2] libext2fs: swap in extent header macros

Resend... with some I missed last time.

Signed-off-by: Eric Sandeen <[email protected]>
---

diff --git a/lib/ext2fs/ext3_extents.h b/lib/ext2fs/ext3_extents.h
index ba980e4..f7c3832 100644
--- a/lib/ext2fs/ext3_extents.h
+++ b/lib/ext2fs/ext3_extents.h
@@ -154,24 +154,31 @@ struct ext3_ext_path {
((struct ext3_extent_idx *) (((char *) (__hdr__)) + \
sizeof(struct ext3_extent_header)))
#define EXT_HAS_FREE_INDEX(__path__) \
- ((__path__)->p_hdr->eh_entries < (__path__)->p_hdr->eh_max)
+ (ext2fs_le16_to_cpu((__path__)->p_hdr->eh_entries) < \
+ ext2fs_le16_to_cpu((__path__)->p_hdr->eh_max))
#define EXT_LAST_EXTENT(__hdr__) \
- (EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->eh_entries - 1)
+ (EXT_FIRST_EXTENT((__hdr__)) + \
+ ext2fs_le16_to_cpu((__hdr__)->eh_entries) - 1)
#define EXT_LAST_INDEX(__hdr__) \
- (EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->eh_entries - 1)
+ (EXT_FIRST_INDEX((__hdr__)) + \
+ ext2fs_le16_to_cpu((__hdr__)->eh_entries) - 1)
#define EXT_MAX_EXTENT(__hdr__) \
- (EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->eh_max - 1)
+ (EXT_FIRST_EXTENT((__hdr__)) + \
+ ext2fs_le16_to_cpu((__hdr__)->eh_max) - 1)
#define EXT_MAX_INDEX(__hdr__) \
- (EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->eh_max - 1)
+ (EXT_FIRST_INDEX((__hdr__)) + \
+ ext2fs_le16_to_cpu((__hdr__)->eh_max) - 1)

#define EXT_ROOT_HDR(tree) \
((struct ext3_extent_header *) (tree)->root)
#define EXT_BLOCK_HDR(bh) \
((struct ext3_extent_header *) (bh)->b_data)
#define EXT_DEPTH(_t_) \
- (((struct ext3_extent_header *)((_t_)->root))->eh_depth)
+ (ext2fs_le16_to_cpu( \
+ ((struct ext3_extent_header *)((_t_)->root))->eh_depth))
#define EXT_GENERATION(_t_) \
- (((struct ext3_extent_header *)((_t_)->root))->eh_generation)
+ (ext2fs_le32_to_cpu( \
+ ((struct ext3_extent_header *)((_t_)->root))->eh_generation))


#define EXT_ASSERT(__x__) if (!(__x__)) BUG();