From: Miao Xie <miaox@cn.fujitsu.com>
Date: Thu, 6 Sep 2012 10:04:57 +0000 (-0600)
Subject: Btrfs: fix wrong size for the reservation when doing, file pre-allocation.
X-Git-Tag: v3.7-rc3~21^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=903889f462409c816893abd02d88636f7b4a7774;p=platform%2Fkernel%2Flinux-stable.git

Btrfs: fix wrong size for the reservation when doing, file pre-allocation.

When we ran fsstress(a program in xfstests), the filesystem hung up when it
is full. It was because the space reserved in btrfs_fallocate() was wrong,
btrfs_fallocate() just used the size of the pre-allocation to reserve the
space, didn't took the block size aligning into account, so the size of
the reserved space was less than the allocated space, it caused the over
reserve problem and made the filesystem hung up when invoking cow_file_range().
Fix it.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
---

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 793bc89..00279c9 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2000,7 +2000,7 @@ static long btrfs_fallocate(struct file *file, int mode,
 	 * Make sure we have enough space before we do the
 	 * allocation.
 	 */
-	ret = btrfs_check_data_free_space(inode, len);
+	ret = btrfs_check_data_free_space(inode, alloc_end - alloc_start + 1);
 	if (ret)
 		return ret;
 
@@ -2107,7 +2107,7 @@ static long btrfs_fallocate(struct file *file, int mode,
 out:
 	mutex_unlock(&inode->i_mutex);
 	/* Let go of our reservation. */
-	btrfs_free_reserved_data_space(inode, len);
+	btrfs_free_reserved_data_space(inode, alloc_end - alloc_start + 1);
 	return ret;
 }