From 223753d9836f86ee272fb877c5abad840550448d Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 27 Jul 2010 11:56:06 -0400
Subject: [PATCH] --- yaml --- r: 206309 b: refs/heads/master c:
 0c095c7f113e9fd05913d6e1b2cccbe356be039e h: refs/heads/master i:   206307:
 4fa0554ee46c73dd5e4d0ec276f07d22b99ce159 v: v3

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

diff --git a/[refs] b/[refs]
index 7409815778bc..f54f777737bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 506bf2d82165c09b179a5077e01037f6270a4db3
+refs/heads/master: 0c095c7f113e9fd05913d6e1b2cccbe356be039e
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 46d2079373c9..38ec77fc3279 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -5472,10 +5472,8 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
 		if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
 			struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
 
-			if (attr->ia_size > sbi->s_bitmap_maxbytes) {
-				error = -EFBIG;
-				goto err_out;
-			}
+			if (attr->ia_size > sbi->s_bitmap_maxbytes)
+				return -EFBIG;
 		}
 	}