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: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c
index c7181779b013276e8c5574f6da76f04779b0209b..2fe737025c5fb62c79e6ee24e4fd7c28be35754c 100644 (file)
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -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);
 }
 

diff --git a/fs/btrfs/delalloc-space.h b/fs/btrfs/delalloc-space.h
index 069005959479d6e891a80f36286128338b68641f..6119c0d3f883cdc0fb8474cf660352568db41982 100644 (file)
--- a/fs/btrfs/delalloc-space.h
+++ b/fs/btrfs/delalloc-space.h
@@ -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,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e7ddf51e0bc7898c0c098028e8e236de8906060c..3a1e5926fee90baf8c96f3a1f1c73cabaa80c267 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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 @@ out_free_data_space:
         * 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:

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 0a6325ebf266ffd7ce0ecb64eba646dcf9294aa4..02086191630d01d75f10e4d10839997192e9e9b1 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2748,8 +2748,8 @@ 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,
-                                              prealloc_end + 1 - cur_offset);
+               btrfs_free_reserved_data_space_noquota(inode,
+                                                      prealloc_end + 1 - cur_offset);
        return ret;
 }