diff --git a/[refs] b/[refs]
index 9e99b3e90d40..df017e18e9bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc6cb1cda5db7b2d24bf32890826214b857c728e
+refs/heads/master: ea51d132dbf9b00063169c1159bee253d9649224
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index d2c86633811f..b5edc6e4bab9 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2508,7 +2508,7 @@ static int ext4_da_write_end(struct file *file,
 	 */
 
 	new_i_size = pos + copied;
-	if (new_i_size > EXT4_I(inode)->i_disksize) {
+	if (copied && new_i_size > EXT4_I(inode)->i_disksize) {
 		if (ext4_da_should_update_i_disksize(page, end)) {
 			down_write(&EXT4_I(inode)->i_data_sem);
 			if (new_i_size > EXT4_I(inode)->i_disksize) {