From 81269a81b705dce5868f3a91aec58d645585dec8 Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Thu, 6 Sep 2012 04:04:57 -0600 Subject: [PATCH] --- yaml --- r: 332546 b: refs/heads/master c: 903889f462409c816893abd02d88636f7b4a7774 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c5091b1d45c6..4406ad7cb176 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69ce977a179750915e04fcc12bfbe33e6c8f5132 +refs/heads/master: 903889f462409c816893abd02d88636f7b4a7774 diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c index 793bc89c660f..00279c9a7f35 100644 --- a/trunk/fs/btrfs/file.c +++ b/trunk/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; }