vserver 1.9.3

[linux-2.6.git] / fs / ext2 / xattr.c

diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 5543e6c..701d844 100644 (file)
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -777,7 +777,8 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
                                                           s_first_data_block) +
                                   EXT2_I(inode)->i_block_group *
                                   EXT2_BLOCKS_PER_GROUP(sb);
-                       int block = ext2_new_block(inode, goal, 0, 0, &error);
+                       int block = ext2_new_block(inode, goal,
+                                                  NULL, NULL, &error);
                        if (error)
                                goto cleanup;
                        ea_idebug(inode, "creating block %d", block);
@@ -1077,7 +1078,7 @@ static inline void ext2_xattr_hash_entry(struct ext2_xattr_header *header,
        }
 
        if (entry->e_value_block == 0 && entry->e_value_size != 0) {
-               __u32 *value = (__u32 *)((char *)header +
+               __le32 *value = (__le32 *)((char *)header +
                        le16_to_cpu(entry->e_value_offs));
                for (n = (le32_to_cpu(entry->e_value_size) +
                     EXT2_XATTR_ROUND) >> EXT2_XATTR_PAD_BITS; n; n--) {