From 61f7b13e7c83b71c40ecaa4bb95ae7771cdee9e9 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Thu, 4 Feb 2010 11:33:03 -0500
Subject: [PATCH] --- yaml --- r: 180276 b: refs/heads/master c:
 23b5c50945f2294add0137799400329c0ebba290 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dad919f2d053..640324f8b41e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efd049fb26a162c3830fd3cb1001fdc09b147f3b
+refs/heads/master: 23b5c50945f2294add0137799400329c0ebba290
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 6782aa19130d..4deb280f8969 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -5799,7 +5799,9 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
 		inode->i_ctime = CURRENT_TIME;
 		BTRFS_I(inode)->flags |= BTRFS_INODE_PREALLOC;
 		if (!(mode & FALLOC_FL_KEEP_SIZE) &&
-		    cur_offset > inode->i_size) {
+			(actual_len > inode->i_size) &&
+			(cur_offset > inode->i_size)) {
+
 			if (cur_offset > actual_len)
 				i_size  = actual_len;
 			else