diff --git a/[refs] b/[refs]
index 0c170c35c7da..6b9e07be8b83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5a7a6b0d9b6af7d46124ed3f6b3995225cb62d0
+refs/heads/master: 221879c927df05280283a4de6124806c17cc44d4
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 754c0d36d162..8593e59020fe 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -2462,12 +2462,12 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len)
 		ret = ext4_ext_get_blocks(handle, inode, block,
 					  max_blocks, &map_bh,
 					  EXT4_CREATE_UNINITIALIZED_EXT, 0);
-		WARN_ON(!ret);
-		if (!ret) {
+		WARN_ON(ret <= 0);
+		if (ret <= 0) {
 			ext4_error(inode->i_sb, "ext4_fallocate",
-				   "ext4_ext_get_blocks returned 0! inode#%lu"
-				   ", block=%u, max_blocks=%lu",
-				   inode->i_ino, block, max_blocks);
+				    "ext4_ext_get_blocks returned error: "
+				    "inode#%lu, block=%u, max_blocks=%lu",
+				    inode->i_ino, block, max_blocks);
 			ret = -EIO;
 			ext4_mark_inode_dirty(handle, inode);
 			ret2 = ext4_journal_stop(handle);