Commit 1c34e719 authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

btrfs: pass struct btrfs_inode to btrfs_free_reserved_data_space_noquota() 



As well as the last patch, pass struct btrfs_inode to the function and
let it distinguish which data space it is working on in a later patch.
There is no functional change with this commit.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5d39fda8

fs/btrfs/delalloc-space.c

+4 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode, 
	/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */

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

	if (ret < 0) {

		btrfs_free_reserved_data_space_noquota(fs_info, len);

		btrfs_free_reserved_data_space_noquota(inode, len);

		extent_changeset_free(*reserved);

		*reserved = NULL;

	} else {
@@ -168,9 +168,9 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode, 
 * which we can't sleep and is sure it won't affect qgroup reserved space.

 * Like clear_bit_hook().

 */

void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info,

					    u64 len)

void btrfs_free_reserved_data_space_noquota(struct btrfs_inode *inode, u64 len)

{

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

	struct btrfs_space_info *data_sinfo;



	ASSERT(IS_ALIGNED(len, fs_info->sectorsize));
@@ -196,7 +196,7 @@ void btrfs_free_reserved_data_space(struct btrfs_inode *inode, 
	      round_down(start, fs_info->sectorsize);

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



	btrfs_free_reserved_data_space_noquota(fs_info, len);

	btrfs_free_reserved_data_space_noquota(inode, len);

	btrfs_qgroup_free_data(inode, reserved, start, len, NULL);

}

fs/btrfs/delalloc-space.h

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ void btrfs_free_reserved_data_space(struct btrfs_inode *inode, 
void btrfs_delalloc_release_space(struct btrfs_inode *inode,

				  struct extent_changeset *reserved,

				  u64 start, u64 len, bool qgroup_free);

void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info,

					    u64 len);

void btrfs_free_reserved_data_space_noquota(struct btrfs_inode *inode, u64 len);

void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,

				     bool qgroup_free);

int btrfs_delalloc_reserve_space(struct btrfs_inode *inode,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2596,7 +2596,7 @@ void btrfs_clear_delalloc_extent(struct btrfs_inode *inode, 
		    !btrfs_is_free_space_inode(inode) &&

		    !(state->state & EXTENT_NORESERVE) &&

		    (bits & EXTENT_CLEAR_DATA_RESV))

			btrfs_free_reserved_data_space_noquota(fs_info, len);

			btrfs_free_reserved_data_space_noquota(inode, len);



		percpu_counter_add_batch(&fs_info->delalloc_bytes, -len,

					 fs_info->delalloc_batch);
@@ -9734,7 +9734,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, 
	 * bytes_may_use.

	 */

	if (!extent_reserved)

		btrfs_free_reserved_data_space_noquota(fs_info, disk_num_bytes);

		btrfs_free_reserved_data_space_noquota(inode, disk_num_bytes);

out_unlock:

	btrfs_unlock_extent(io_tree, start, end, &cached_state);

out_folios:

fs/btrfs/relocation.c

+2 −2
Original line number Diff line number Diff line
@@ -2748,7 +2748,7 @@ static noinline_for_stack int prealloc_file_extent_cluster(struct reloc_control 
	btrfs_inode_unlock(inode, 0);



	if (cur_offset < prealloc_end)

		btrfs_free_reserved_data_space_noquota(inode->root->fs_info,

		btrfs_free_reserved_data_space_noquota(inode,

						       prealloc_end + 1 - cur_offset);

	return ret;

}