From ecf9de40a630a36b886c9dd27d1f7d7dfaa8ed09 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Tue, 16 Oct 2007 18:38:25 -0400
Subject: [PATCH] --- yaml --- r: 71087 b: refs/heads/master c:
 ac39849ddc19c0bbb39068497139ac45bccd4321 h: refs/heads/master i:   71085:
 ef22471a9ae1adc4d987b20a93cc0f06b2f0aa81   71083:
 3e97510323e9cf48e3b89cab63137e834072e0b4   71079:
 6564cb34f77c261048076f6902fffc485ac8eae6   71071:
 af8ce6a9d7243d8c2e4a365b6c080dac4359f99a v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/fsync.c | 2 +-
 trunk/fs/ext4/inode.c | 2 +-
 trunk/fs/ext4/xattr.c | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d607d1e4787f..927d11b56e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8dd0b45438d62fc4a93d8e3cee9985710d01e40
+refs/heads/master: ac39849ddc19c0bbb39068497139ac45bccd4321
diff --git a/trunk/fs/ext4/fsync.c b/trunk/fs/ext4/fsync.c
index 2a167d7131fa..8d50879d1c2c 100644
--- a/trunk/fs/ext4/fsync.c
+++ b/trunk/fs/ext4/fsync.c
@@ -47,7 +47,7 @@ int ext4_sync_file(struct file * file, struct dentry *dentry, int datasync)
 	struct inode *inode = dentry->d_inode;
 	int ret = 0;
 
-	J_ASSERT(ext4_journal_current_handle() == 0);
+	J_ASSERT(ext4_journal_current_handle() == NULL);
 
 	/*
 	 * data=writeback:
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 89dd87634a2f..5489703d9573 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -1027,7 +1027,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
 		}
 		if (buffer_new(&dummy)) {
 			J_ASSERT(create != 0);
-			J_ASSERT(handle != 0);
+			J_ASSERT(handle != NULL);
 
 			/*
 			 * Now that we do not always journal data, we should
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
index 12c7d65fb0ca..86387302c2a9 100644
--- a/trunk/fs/ext4/xattr.c
+++ b/trunk/fs/ext4/xattr.c
@@ -1120,7 +1120,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
 	int total_ino, total_blk;
 	void *base, *start, *end;
 	int extra_isize = 0, error = 0, tried_min_extra_isize = 0;
-	int s_min_extra_isize = EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize;
+	int s_min_extra_isize = le16_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize);
 
 	down_write(&EXT4_I(inode)->xattr_sem);
 retry:
@@ -1292,7 +1292,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
 
 		i.name = b_entry_name;
 		i.value = buffer;
-		i.value_len = cpu_to_le32(size);
+		i.value_len = size;
 		error = ext4_xattr_block_find(inode, &i, bs);
 		if (error)
 			goto cleanup;