vserver 1.9.3

[linux-2.6.git] / fs / hfsplus / bnode.c

diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index 5ce5d77..e0edb70 100644 (file)
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -44,7 +44,7 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
 
 u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)
 {
-       u16 data;
+       __be16 data;
        // optimize later...
        hfs_bnode_read(node, &data, off, 2);
        return be16_to_cpu(data);
@@ -55,7 +55,7 @@ u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off)
        u8 data;
        // optimize later...
        hfs_bnode_read(node, &data, off, 1);
-       return be16_to_cpu(data);
+       return data;
 }
 
 void hfs_bnode_read_key(struct hfs_bnode *node, void *key, int off)
@@ -98,9 +98,9 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)
 
 void hfs_bnode_write_u16(struct hfs_bnode *node, int off, u16 data)
 {
-       data = cpu_to_be16(data);
+       __be16 v = cpu_to_be16(data);
        // optimize later...
-       hfs_bnode_write(node, &data, off, 2);
+       hfs_bnode_write(node, &v, off, 2);
 }
 
 void hfs_bnode_clear(struct hfs_bnode *node, int off, int len)
@@ -297,7 +297,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)
 void hfs_bnode_dump(struct hfs_bnode *node)
 {
        struct hfs_bnode_desc desc;
-       u32 cnid;
+       __be32 cnid;
        int i, off, key_off;
 
        dprint(DBG_BNODE_MOD, "bnode: %d\n", node->this);
@@ -334,7 +334,7 @@ void hfs_bnode_unlink(struct hfs_bnode *node)
 {
        struct hfs_btree *tree;
        struct hfs_bnode *tmp;
-       u32 cnid;
+       __be32 cnid;
 
        tree = node->tree;
        if (node->prev) {