Commit 0bb067ca authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: fix the qgroup data free range for inline data extents 



Inside function __cow_file_range_inline() since the inlined data no
longer take any data space, we need to free up the reserved space.

However the code is still using the old page size == sector size
assumption, and will not handle subpage case well.

Thankfully it is not going to cause any problems because we have two extra
safe nets:

- Inline data extents creation is disabled for sector size < page size
  cases for now
  But it won't stay that for long.

- btrfs_qgroup_free_data() will only clear ranges which have been already
  reserved
  So even if we pass a range larger than what we need, it should still
  be fine, especially there is only reserved space for a single block at
  file offset 0 of an inline data extent.

But just for the sake of consistency, fix the call site to use
sectorsize instead of page size.

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1a5b5668

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static noinline int __cow_file_range_inline(struct btrfs_inode *inode, 
	 * And at reserve time, it's always aligned to page size, so

	 * just free one page here.

	 */

	btrfs_qgroup_free_data(inode, NULL, 0, PAGE_SIZE, NULL);

	btrfs_qgroup_free_data(inode, NULL, 0, fs_info->sectorsize, NULL);

	btrfs_free_path(path);

	btrfs_end_transaction(trans);

	return ret;