Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff6fabd authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: fix off-by-one error of the reserved size of btrfs_allocate() 



alloc_end is not the real end of the current extent, it is the start of the
next adjoining extent. So we needn't +1 when calculating the size the space
that is about to be reserved.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 797f4277

fs/btrfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -2072,7 +2072,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, alloc_end - alloc_start + 1);

	ret = btrfs_check_data_free_space(inode, alloc_end - alloc_start);

	if (ret)

		return ret;
@@ -2179,7 +2179,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, alloc_end - alloc_start + 1);

	btrfs_free_reserved_data_space(inode, alloc_end - alloc_start);

	return ret;

}