From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Date: Thu, 4 Feb 2010 16:33:03 +0000 (-0500)
Subject: Btrfs: apply updated fallocate i_size fix
X-Git-Tag: firefly_0821_release~10186^2~1153
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b5763c0f3bb1ca5ca64d2b72d07e8b42ab624ab0;p=firefly-linux-kernel-4.4.55.git

Btrfs: apply updated fallocate i_size fix

commit 23b5c50945f2294add0137799400329c0ebba290 upstream.

This version of the i_size fix for fallocate makes sure we only update
the i_size when the current fallocate is really operating outside of
i_size.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8fa67e096305..e03a836d50d0 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5798,7 +5798,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