diff --git a/[refs] b/[refs]
index 6099d8d2bad9..b560849def05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b0f165f790c897fa744e7fed6f0bfeb6eb6f494
+refs/heads/master: 24ec19b0ae83a385ad9c55520716da671274b96c
diff --git a/trunk/fs/ext4/acl.c b/trunk/fs/ext4/acl.c
index d3c5b88fd89f..e6e0d988439b 100644
--- a/trunk/fs/ext4/acl.c
+++ b/trunk/fs/ext4/acl.c
@@ -423,8 +423,10 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
 
 retry:
 	handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
-	if (IS_ERR(handle))
-		return PTR_ERR(handle);
+	if (IS_ERR(handle)) {
+		error = PTR_ERR(handle);
+		goto release_and_out;
+	}
 	error = ext4_set_acl(handle, inode, type, acl);
 	ext4_journal_stop(handle);
 	if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))