btrfs: Remove __ prefix from btrfs_block_rsv_release

Currently the non-prefixed version is a simple wrapper used to hide
the 4th argument of the prefixed version. This doesn't bring much value
in practice and only makes the code harder to follow by adding another
level of indirection. Rectify this by removing the __ prefix and
have only one public function to release bytes from a block reservation.
No semantic changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index 2f64394..27efec8 100644 (file)
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -203,7 +203,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
 {
        if (!rsv)
                return;
-       btrfs_block_rsv_release(fs_info, rsv, (u64)-1);
+       btrfs_block_rsv_release(fs_info, rsv, (u64)-1, NULL);
        kfree(rsv);
 }
 
@@ -270,9 +270,9 @@ int btrfs_block_rsv_refill(struct btrfs_root *root,
        return ret;
 }
 
-u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
-                             struct btrfs_block_rsv *block_rsv,
-                             u64 num_bytes, u64 *qgroup_to_release)
+u64 btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
+                           struct btrfs_block_rsv *block_rsv, u64 num_bytes,
+                           u64 *qgroup_to_release)
 {
        struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
        struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_refs_rsv;
@@ -436,7 +436,8 @@ void btrfs_init_global_block_rsv(struct btrfs_fs_info *fs_info)
 
 void btrfs_release_global_block_rsv(struct btrfs_fs_info *fs_info)
 {
-       btrfs_block_rsv_release(fs_info, &fs_info->global_block_rsv, (u64)-1);
+       btrfs_block_rsv_release(fs_info, &fs_info->global_block_rsv, (u64)-1,
+                               NULL);
        WARN_ON(fs_info->trans_block_rsv.size > 0);
        WARN_ON(fs_info->trans_block_rsv.reserved > 0);
        WARN_ON(fs_info->chunk_block_rsv.size > 0);

diff --git a/fs/btrfs/block-rsv.h b/fs/btrfs/block-rsv.h
index d1428bb..0b6ae53 100644 (file)
--- a/fs/btrfs/block-rsv.h
+++ b/fs/btrfs/block-rsv.h
@@ -73,7 +73,7 @@ int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info,
                             int min_factor);
 void btrfs_block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv,
                               u64 num_bytes, bool update_size);
-u64 __btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
+u64 btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
                              struct btrfs_block_rsv *block_rsv,
                              u64 num_bytes, u64 *qgroup_to_release);
 void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info);
@@ -82,20 +82,12 @@ void btrfs_release_global_block_rsv(struct btrfs_fs_info *fs_info);
 struct btrfs_block_rsv *btrfs_use_block_rsv(struct btrfs_trans_handle *trans,
                                            struct btrfs_root *root,
                                            u32 blocksize);
-
-static inline void btrfs_block_rsv_release(struct btrfs_fs_info *fs_info,
-                                          struct btrfs_block_rsv *block_rsv,
-                                          u64 num_bytes)
-{
-       __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, NULL);
-}
-
 static inline void btrfs_unuse_block_rsv(struct btrfs_fs_info *fs_info,
                                         struct btrfs_block_rsv *block_rsv,
                                         u32 blocksize)
 {
        btrfs_block_rsv_add_bytes(block_rsv, blocksize, false);
-       btrfs_block_rsv_release(fs_info, block_rsv, 0);
+       btrfs_block_rsv_release(fs_info, block_rsv, 0, NULL);
 }
 
 #endif /* BTRFS_BLOCK_RSV_H */

diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c
index f23d07a..1245739 100644 (file)
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -330,8 +330,8 @@ static void btrfs_inode_rsv_release(struct btrfs_inode *inode, bool qgroup_free)
         * are releasing 0 bytes, and then we'll just get the reservation over
         * the size free'd.
         */
-       released = __btrfs_block_rsv_release(fs_info, block_rsv, 0,
-                                            &qgroup_to_release);
+       released = btrfs_block_rsv_release(fs_info, block_rsv, 0,
+                                          &qgroup_to_release);
        if (released > 0)
                trace_btrfs_space_reservation(fs_info, "delalloc",
                                              btrfs_ino(inode), released, 0);

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index ee70584..f678980 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -595,8 +595,7 @@ static void btrfs_delayed_item_release_metadata(struct btrfs_root *root,
        trace_btrfs_space_reservation(fs_info, "delayed_item",
                                      item->key.objectid, item->bytes_reserved,
                                      0);
-       btrfs_block_rsv_release(fs_info, rsv,
-                               item->bytes_reserved);
+       btrfs_block_rsv_release(fs_info, rsv, item->bytes_reserved, NULL);
 }
 
 static int btrfs_delayed_inode_reserve_metadata(
@@ -677,8 +676,7 @@ static void btrfs_delayed_inode_release_metadata(struct btrfs_fs_info *fs_info,
        rsv = &fs_info->delayed_block_rsv;
        trace_btrfs_space_reservation(fs_info, "delayed_inode",
                                      node->inode_id, node->bytes_reserved, 0);
-       btrfs_block_rsv_release(fs_info, rsv,
-                               node->bytes_reserved);
+       btrfs_block_rsv_release(fs_info, rsv, node->bytes_reserved, NULL);
        if (qgroup_free)
                btrfs_qgroup_free_meta_prealloc(node->root,
                                node->bytes_reserved);

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index dfdb7d4..353cc29 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -82,8 +82,7 @@ void btrfs_delayed_refs_rsv_release(struct btrfs_fs_info *fs_info, int nr)
        u64 num_bytes = btrfs_calc_insert_metadata_size(fs_info, nr);
        u64 released = 0;
 
-       released = __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes,
-                                            NULL);
+       released = btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, NULL);
        if (released)
                trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv",
                                              0, released, 0);

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index d5c9c69..6009e0e 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -515,7 +515,7 @@ out_release:
        trace_btrfs_space_reservation(fs_info, "ino_cache", trans->transid,
                                      trans->bytes_reserved, 0);
        btrfs_block_rsv_release(fs_info, trans->block_rsv,
-                               trans->bytes_reserved);
+                               trans->bytes_reserved, NULL);
 out:
        trans->block_rsv = rsv;
        trans->bytes_reserved = num_bytes;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1e138c8..f7c6645 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8702,7 +8702,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
                        break;
                }
 
-               btrfs_block_rsv_release(fs_info, rsv, -1);
+               btrfs_block_rsv_release(fs_info, rsv, -1, NULL);
                ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,
                                              rsv, min_size, false);
                BUG_ON(ret);    /* shouldn't happen */

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index deb59e7..ff1ff90 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -383,7 +383,7 @@ static int inherit_props(struct btrfs_trans_handle *trans,
 
                if (need_reserve) {
                        btrfs_block_rsv_release(fs_info, trans->block_rsv,
-                                       num_bytes);
+                                       num_bytes, NULL);
                        if (ret)
                                return ret;
                }

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 008ba7e..782c9e9 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2478,7 +2478,7 @@ again:
        if (IS_ERR(trans)) {
                if (!err)
                        btrfs_block_rsv_release(fs_info, rc->block_rsv,
-                                               num_bytes);
+                                               num_bytes, NULL);
                return PTR_ERR(trans);
        }
 
@@ -2486,7 +2486,7 @@ again:
                if (num_bytes != rc->merging_rsv_size) {
                        btrfs_end_transaction(trans);
                        btrfs_block_rsv_release(fs_info, rc->block_rsv,
-                                               num_bytes);
+                                               num_bytes, NULL);
                        goto again;
                }
        }
@@ -4265,7 +4265,7 @@ restart:
        set_reloc_control(rc);
 
        backref_cache_cleanup(&rc->backref_cache);
-       btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1);
+       btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1, NULL);
 
        /*
         * Even in the case when the relocation is cancelled, we should all go
@@ -4281,7 +4281,7 @@ restart:
 
        rc->merge_reloc_tree = 0;
        unset_reloc_control(rc);
-       btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1);
+       btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1, NULL);
 
        /* get rid of pinned extents */
        trans = btrfs_join_transaction(rc->extent_root);

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 98b6e0d..668f228 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -520,5 +520,5 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
 void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
                                      struct btrfs_block_rsv *rsv)
 {
-       btrfs_block_rsv_release(fs_info, rsv, (u64)-1);
+       btrfs_block_rsv_release(fs_info, rsv, (u64)-1, NULL);
 }

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index ca61744..096c0aa 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -221,7 +221,7 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)
        WARN_ON_ONCE(!list_empty(&trans->new_bgs));
 
        btrfs_block_rsv_release(fs_info, &fs_info->chunk_block_rsv,
-                               trans->chunk_bytes_reserved);
+                               trans->chunk_bytes_reserved, NULL);
        trans->chunk_bytes_reserved = 0;
 }
 
@@ -675,7 +675,7 @@ join_fail:
 alloc_fail:
        if (num_bytes)
                btrfs_block_rsv_release(fs_info, &fs_info->trans_block_rsv,
-                                       num_bytes);
+                                       num_bytes, NULL);
 reserve_fail:
        btrfs_qgroup_free_meta_pertrans(root, qgroup_reserved);
        return ERR_PTR(ret);
@@ -898,7 +898,7 @@ static void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans)
        trace_btrfs_space_reservation(fs_info, "transaction",
                                      trans->transid, trans->bytes_reserved, 0);
        btrfs_block_rsv_release(fs_info, trans->block_rsv,
-                               trans->bytes_reserved);
+                               trans->bytes_reserved, NULL);
        trans->bytes_reserved = 0;
 }