Commit 36ea6f3e authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_check_data_free_space take btrfs_inode 



Instead of calling BTRFS_I on the passed vfs_inode take btrfs_inode
directly.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 86d52921

fs/btrfs/block-group.c

+2 −1
Original line number Diff line number Diff line
@@ -2508,7 +2508,8 @@ static int cache_save_setup(struct btrfs_block_group *block_group, 
	num_pages *= 16;

	num_pages *= PAGE_SIZE;



	ret = btrfs_check_data_free_space(inode, &data_reserved, 0, num_pages);

	ret = btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved, 0,

					  num_pages);

	if (ret)

		goto out_put;

fs/btrfs/delalloc-space.c

+5 −5
Original line number Diff line number Diff line
@@ -237,10 +237,10 @@ int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes) 
	return 0;

}



int btrfs_check_data_free_space(struct inode *inode,

int btrfs_check_data_free_space(struct btrfs_inode *inode,

			struct extent_changeset **reserved, u64 start, u64 len)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	int ret;



	/* align the range */
@@ -248,12 +248,12 @@ int btrfs_check_data_free_space(struct inode *inode, 
	      round_down(start, fs_info->sectorsize);

	start = round_down(start, fs_info->sectorsize);



	ret = btrfs_alloc_data_chunk_ondemand(BTRFS_I(inode), len);

	ret = btrfs_alloc_data_chunk_ondemand(inode, len);

	if (ret < 0)

		return ret;



	/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */

	ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), reserved, start, len);

	ret = btrfs_qgroup_reserve_data(inode, reserved, start, len);

	if (ret < 0)

		btrfs_free_reserved_data_space_noquota(fs_info, len);

	else
@@ -558,7 +558,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode, 
{

	int ret;



	ret = btrfs_check_data_free_space(inode, reserved, start, len);

	ret = btrfs_check_data_free_space(BTRFS_I(inode), reserved, start, len);

	if (ret < 0)

		return ret;

	ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len);

fs/btrfs/delalloc-space.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
struct extent_changeset;



int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes);

int btrfs_check_data_free_space(struct inode *inode,

int btrfs_check_data_free_space(struct btrfs_inode *inode,

			struct extent_changeset **reserved, u64 start, u64 len);

void btrfs_free_reserved_data_space(struct btrfs_inode *inode,

			struct extent_changeset *reserved, u64 start, u64 len);

fs/btrfs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -1681,7 +1681,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, 
				fs_info->sectorsize);



		extent_changeset_release(data_reserved);

		ret = btrfs_check_data_free_space(inode, &data_reserved, pos,

		ret = btrfs_check_data_free_space(BTRFS_I(inode),

						  &data_reserved, pos,

						  write_bytes);

		if (ret < 0) {

			if (btrfs_check_nocow_lock(BTRFS_I(inode), pos,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -4519,8 +4519,8 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
	block_end = block_start + blocksize - 1;





	ret = btrfs_check_data_free_space(inode, &data_reserved, block_start,

					  blocksize);

	ret = btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved,

					  block_start, blocksize);

	if (ret < 0) {

		if (btrfs_check_nocow_lock(BTRFS_I(inode), block_start,

					   &write_bytes) > 0) {