From c1b9fd7dfa041a83b63ec9673e26eec7afcb8cd9 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Wed, 26 Oct 2011 03:32:07 -0400
Subject: [PATCH] --- yaml --- r: 273154 b: refs/heads/master c:
 665436175c3ca9d35f135e1ba6bdd63745cff08a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3270f6e893a6..f9492d8ffa03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909a4cf1ffe4b875c87abf38239a9bfd25167e0c
+refs/heads/master: 665436175c3ca9d35f135e1ba6bdd63745cff08a
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
index c757adc97250..0ae3668520f8 100644
--- a/trunk/fs/ext4/xattr.c
+++ b/trunk/fs/ext4/xattr.c
@@ -985,11 +985,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
 	no_expand = ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND);
 	ext4_set_inode_state(inode, EXT4_STATE_NO_EXPAND);
 
-	error = ext4_get_inode_loc(inode, &is.iloc);
-	if (error)
-		goto cleanup;
-
-	error = ext4_journal_get_write_access(handle, is.iloc.bh);
+	error = ext4_reserve_inode_write(handle, inode, &is.iloc);
 	if (error)
 		goto cleanup;