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)