diff --git a/[refs] b/[refs]
index 81cdb2428df6..47d99a65a46b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e8303677fc15f508b9877e0fea1925c4add6f3
+refs/heads/master: d889dc8382c4d71b6d538b7b13777bc1ec51df10
diff --git a/trunk/fs/ext4/file.c b/trunk/fs/ext4/file.c
index bd411c12d63d..ee92b66d4558 100644
--- a/trunk/fs/ext4/file.c
+++ b/trunk/fs/ext4/file.c
@@ -70,7 +70,8 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
 		struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
 		size_t length = iov_length(iov, nr_segs);
 
-		if (pos > sbi->s_bitmap_maxbytes)
+		if ((pos > sbi->s_bitmap_maxbytes ||
+		    (pos == sbi->s_bitmap_maxbytes && length > 0)))
 			return -EFBIG;
 
 		if (pos + length > sbi->s_bitmap_maxbytes) {