Btrfs: fix typo in fallocate to make it honor actual size

Commit Message

Josef Bacik Nov. 22, 2010, 6:50 p.m. UTC

None

Patch

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index bdc0a9e..d83f288 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6841,6 +6841,7 @@  static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	struct btrfs_key ins;
 	u64 cur_offset = start;
+	u64 i_size;
 	int ret = 0;
 	bool own_trans = true;
 
@@ -6882,11 +6883,11 @@  static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
 		    (actual_len > inode->i_size) &&
 		    (cur_offset > inode->i_size)) {
 			if (cur_offset > actual_len)
-				i_size_write(inode, actual_len);
+				i_size = actual_len;
 			else
-				i_size_write(inode, cur_offset);
-			i_size_write(inode, cur_offset);
-			btrfs_ordered_update_i_size(inode, cur_offset, NULL);
+				i_size = cur_offset;
+			i_size_write(inode, i_size);
+			btrfs_ordered_update_i_size(inode, i_size, NULL);
 		}
 
 		ret = btrfs_update_inode(trans, root, inode);