From 9983dd52155e9bbe5d74a4df9cbade3c9df7cb81 Mon Sep 17 00:00:00 2001
From: Greg Harm <gharm@google.com>
Date: Mon, 31 Oct 2011 18:41:47 -0400
Subject: [PATCH] --- yaml --- r: 273182 b: refs/heads/master c:
 3c6fe77017bc6ce489f231c35fed3220b6691836 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/fs/ext4/extents.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 926e0f8f328d..4936d18ca55c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4af835089984ce9e24c44a51be64c5524788e973
+refs/heads/master: 3c6fe77017bc6ce489f231c35fed3220b6691836
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index a5c8caaaa099..2798945a1920 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -4337,10 +4337,16 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 		trace_ext4_fallocate_exit(inode, offset, max_blocks, ret);
 		return ret;
 	}
-	flags = EXT4_GET_BLOCKS_CREATE_UNINIT_EXT |
-		EXT4_GET_BLOCKS_NO_NORMALIZE;
+	flags = EXT4_GET_BLOCKS_CREATE_UNINIT_EXT;
 	if (mode & FALLOC_FL_KEEP_SIZE)
 		flags |= EXT4_GET_BLOCKS_KEEP_SIZE;
+	/*
+	 * Don't normalize the request if it can fit in one extent so
+	 * that it doesn't get unnecessarily split into multiple
+	 * extents.
+	 */
+	if (len <= EXT_UNINIT_MAX_LEN << blkbits)
+		flags |= EXT4_GET_BLOCKS_NO_NORMALIZE;
 retry:
 	while (ret >= 0 && ret < max_blocks) {
 		map.m_lblk = map.m_lblk + ret;