From 68628e43804cea814e0741d078dd867d5fa8df3e Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Mon, 15 Feb 2010 14:26:16 -0500
Subject: [PATCH] --- yaml --- r: 185859 b: refs/heads/master c:
 9aaab0589baa61d637a52badddbff2d74f35a955 h: refs/heads/master i:   185857:
 09008654e9fbedc8793a659a5b62ab0233b9f26b   185855:
 38d116dc4bca1df2f2ee579bb69ecd2c6a1b3f36 v: v3

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

diff --git a/[refs] b/[refs]
index 5c39c9e16316..f24cf3dfb9ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12062dddda450976b129dcb1bacd91acaf4d8030
+refs/heads/master: 9aaab0589baa61d637a52badddbff2d74f35a955
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
index 627c98abbed9..efc16a4b7ceb 100644
--- a/trunk/fs/ext4/xattr.c
+++ b/trunk/fs/ext4/xattr.c
@@ -1300,6 +1300,8 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
 
 		/* Remove the chosen entry from the inode */
 		error = ext4_xattr_ibody_set(handle, inode, &i, is);
+		if (error)
+			goto cleanup;
 
 		entry = IFIRST(header);
 		if (entry_size + EXT4_XATTR_SIZE(size) >= new_extra_isize)