From 94c111a678ce4b69e7bc4a4df8099034ca962240 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Thu, 18 Aug 2011 10:36:39 -0400
Subject: [PATCH] --- yaml --- r: 263103 b: refs/heads/master c:
 f1e490a7ebe41e06324abbbcd86005b0af02a375 h: refs/heads/master i:   263101:
 7d914d0ac3c278b15fd7d653f313e76acadd4944   263099:
 fe2aaaa11f76e50564c120f4a089b2a3acf5e4d4   263095:
 8405af1f207781142fd4e659860103efb2e66e60   263087:
 c23d13ceaf8dd726d484261adcbbcbd8651dff7b   263071:
 b0823e7391bd40300f3dfc7867ed33e9f74aebab   263039:
 21e9f9542619fb723e94f592d25d0cb56d1a0392 v: v3

---
 [refs]                |  2 +-
 trunk/fs/btrfs/file.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e50f25213f90..b8fd7d2d5b87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f81c9cdc567cd3160ff9e64868d9a1a7ee226480
+refs/heads/master: f1e490a7ebe41e06324abbbcd86005b0af02a375
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
index 0705d15542c6..15e5a1cd8764 100644
--- a/trunk/fs/btrfs/file.c
+++ b/trunk/fs/btrfs/file.c
@@ -1631,11 +1631,15 @@ static long btrfs_fallocate(struct file *file, int mode,
 
 	cur_offset = alloc_start;
 	while (1) {
+		u64 actual_end;
+
 		em = btrfs_get_extent(inode, NULL, 0, cur_offset,
 				      alloc_end - cur_offset, 0);
 		BUG_ON(IS_ERR_OR_NULL(em));
 		last_byte = min(extent_map_end(em), alloc_end);
+		actual_end = min_t(u64, extent_map_end(em), offset + len);
 		last_byte = (last_byte + mask) & ~mask;
+
 		if (em->block_start == EXTENT_MAP_HOLE ||
 		    (cur_offset >= inode->i_size &&
 		     !test_bit(EXTENT_FLAG_PREALLOC, &em->flags))) {
@@ -1648,6 +1652,16 @@ static long btrfs_fallocate(struct file *file, int mode,
 				free_extent_map(em);
 				break;
 			}
+		} else if (actual_end > inode->i_size &&
+			   !(mode & FALLOC_FL_KEEP_SIZE)) {
+			/*
+			 * We didn't need to allocate any more space, but we
+			 * still extended the size of the file so we need to
+			 * update i_size.
+			 */
+			inode->i_ctime = CURRENT_TIME;
+			i_size_write(inode, actual_end);
+			btrfs_ordered_update_i_size(inode, actual_end, NULL);
 		}
 		free_extent_map(em);