X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=include%2Freiserfs%2Freiserfs.h;h=165584b89604cc80d5b35d591b10282484282910;hp=2e27a27e3ab47866fc0f4d850e883c79057913b9;hb=78cfabe0fac2682681c604bfe9b7266f173b9ea2;hpb=f4ebbd9f7ea23e3f0fcbe098754580c220894628

diff --git a/include/reiserfs/reiserfs.h b/include/reiserfs/reiserfs.h
index 2e27a27..165584b 100644
--- a/include/reiserfs/reiserfs.h
+++ b/include/reiserfs/reiserfs.h
@@ -95,14 +95,14 @@ struct reiserfs_journal_header {
 /* Item version determines which offset_v# struct to use */
 #define ITEM_VERSION_1 0
 #define ITEM_VERSION_2 1
-#define IH_KEY_OFFSET(ih) (INFO->version < 2 \
-                           || ih_version(ih) == ITEM_VERSION_1 \
-                           ? (ih)->ih_key.u.k_offset_v1.k_offset \
+#define IH_KEY_OFFSET(ih) ((INFO->version < 2 \
+                           || ih_version(ih) == ITEM_VERSION_1) \
+                           ? le32_to_cpu ((ih)->ih_key.u.k_offset_v1.k_offset) \
                            : offset_v2_k_offset(&(ih)->ih_key.u.k_offset_v2))
- 
-#define IH_KEY_ISTYPE(ih, type) (INFO->version < 2 \
-                || ih_version(ih) == ITEM_VERSION_1 \
-                ? (ih)->ih_key.u.k_offset_v1.k_uniqueness == V1_##type \
+
+#define IH_KEY_ISTYPE(ih, type) ((INFO->version < 2 \
+                || ih_version(ih) == ITEM_VERSION_1) \
+                ? le32_to_cpu((ih)->ih_key.u.k_offset_v1.k_uniqueness) == V1_##type \
                 : offset_v2_k_type(&(ih)->ih_key.u.k_offset_v2) == V2_##type)
 
 //
@@ -154,7 +154,7 @@ struct key {
 #define TYPE_DIRECT 2
 #define TYPE_DIRENTRY 3
 #define TYPE_ANY 15 // FIXME: comment is required
- 
+
 //
 // in old version uniqueness field shows key type
 //
@@ -196,7 +196,7 @@ struct item_head
 
 /* Header of a disk block.  More precisely, header of a formatted leaf
    or internal node, and not the header of an unformatted node. */
-struct block_head {       
+struct block_head {
     __u16 blk_level;                  /* Level of a block in the tree */
     __u16 blk_nr_item;                /* Number of keys/items in a block */
     __u16 blk_free_space;             /* Block free space in bytes */
@@ -322,7 +322,7 @@ struct reiserfs_de_head
 #define DOT_OFFSET 1
 #define DOT_DOT_OFFSET 2
 #define DIRENTRY_UNIQUENESS 500
- 
+
 #define V1_TYPE_STAT_DATA 0x0
 #define V1_TYPE_DIRECT 0xffffffff
 #define V1_TYPE_INDIRECT 0xfffffffe
@@ -332,14 +332,14 @@ struct reiserfs_de_head
 #define V2_TYPE_DIRECT 2
 #define V2_TYPE_DIRENTRY 3
 
- 
+
 #define REISERFS_ROOT_OBJECTID 2
 #define REISERFS_ROOT_PARENT_OBJECTID 1
 #define REISERFS_SUPERBLOCK_BLOCK 16
 /* the spot for the super in versions 3.5 - 3.5.11 (inclusive) */
 #define REISERFS_OLD_SUPERBLOCK_BLOCK 2
 #define REISERFS_OLD_BLOCKSIZE 4096
- 
+
 #define S_ISREG(mode) (((mode) & 0170000) == 0100000)
 #define S_ISDIR(mode) (((mode) & 0170000) == 0040000)
 #define S_ISLNK(mode) (((mode) & 0170000) == 0120000)
@@ -367,7 +367,7 @@ struct reiserfs_state
     __u32 journal_block_count; /* The size of the journal */
     __u32 journal_first_desc;  /* The first valid descriptor block in journal
                                  (relative to journal_block) */
-    
+
    __u16 version;              /* The ReiserFS version. */
    __u16 tree_depth;           /* The current depth of the reiser tree. */
    __u8  blocksize_shift;      /* 1 << blocksize_shift == blocksize. */