btrfs: rename remaining exported functions from extent-io-tree.h

Rename the remaning exported functions that don't have a 'btrfs_' prefix.
By convention exported functions should have such prefix to make it clear
they are btrfs specific and to avoid collisions with functions from
elsewhere in the kernel.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index 6317004f36c4f052ec0ba0906c889dbe15f47b35..503bb387e7a201666af3903fa75903694b22ae44 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -1280,9 +1280,9 @@ int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
  *
  * All allocations are done with GFP_NOFS.
  */
-int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
-                      u32 bits, u32 clear_bits,
-                      struct extent_state **cached_state)
+int btrfs_convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
+                            u32 bits, u32 clear_bits,
+                            struct extent_state **cached_state)
 {
        struct extent_state *state;
        struct extent_state *prealloc = NULL;
@@ -1805,8 +1805,8 @@ bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 b
 }
 
 /* Wrappers around set/clear extent bit */
-int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                          u32 bits, struct extent_changeset *changeset)
+int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
+                                u32 bits, struct extent_changeset *changeset)
 {
        /*
         * We don't support EXTENT_LOCK_BITS yet, as current changeset will
@@ -1818,8 +1818,8 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
        return __set_extent_bit(tree, start, end, bits, NULL, NULL, NULL, changeset);
 }
 
-int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                            u32 bits, struct extent_changeset *changeset)
+int btrfs_clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
+                                  u32 bits, struct extent_changeset *changeset)
 {
        /*
         * Don't support EXTENT_LOCK_BITS case, same reason as
@@ -1873,13 +1873,13 @@ int btrfs_lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, u32
        return err;
 }
 
-void __cold extent_state_free_cachep(void)
+void __cold btrfs_extent_state_free_cachep(void)
 {
        btrfs_extent_state_leak_debug_check();
        kmem_cache_destroy(extent_state_cache);
 }
 
-int __init extent_state_init_cachep(void)
+int __init btrfs_extent_state_init_cachep(void)
 {
        extent_state_cache = kmem_cache_create("btrfs_extent_state",
                                               sizeof(struct extent_state), 0, 0,

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index 238732b23e93f634fabfa126a7328ed29207a994..625f4cd3debd4c63784e2994f5a50611c9029ec1 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -157,8 +157,8 @@ static inline bool btrfs_try_lock_extent(struct extent_io_tree *tree, u64 start,
        return btrfs_try_lock_extent_bits(tree, start, end, EXTENT_LOCKED, cached);
 }
 
-int __init extent_state_init_cachep(void);
-void __cold extent_state_free_cachep(void);
+int __init btrfs_extent_state_init_cachep(void);
+void __cold btrfs_extent_state_free_cachep(void);
 
 u64 btrfs_count_range_bits(struct extent_io_tree *tree,
                           u64 *start, u64 search_end,
@@ -171,8 +171,8 @@ bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 b
 bool btrfs_test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit);
 void btrfs_get_range_bits(struct extent_io_tree *tree, u64 start, u64 end, u32 *bits,
                          struct extent_state **cached_state);
-int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                            u32 bits, struct extent_changeset *changeset);
+int btrfs_clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
+                                  u32 bits, struct extent_changeset *changeset);
 int btrfs_clear_extent_bit_changeset(struct extent_io_tree *tree, u64 start, u64 end,
                                     u32 bits, struct extent_state **cached,
                                     struct extent_changeset *changeset);
@@ -197,8 +197,8 @@ static inline int btrfs_clear_extent_bits(struct extent_io_tree *tree, u64 start
        return btrfs_clear_extent_bit(tree, start, end, bits, NULL);
 }
 
-int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                          u32 bits, struct extent_changeset *changeset);
+int btrfs_set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
+                                u32 bits, struct extent_changeset *changeset);
 int btrfs_set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
                         u32 bits, struct extent_state **cached_state);
 
@@ -210,9 +210,9 @@ static inline int btrfs_clear_extent_dirty(struct extent_io_tree *tree, u64 star
                                      EXTENT_DO_ACCOUNTING, cached);
 }
 
-int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
-                      u32 bits, u32 clear_bits,
-                      struct extent_state **cached_state);
+int btrfs_convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
+                            u32 bits, u32 clear_bits,
+                            struct extent_state **cached_state);
 
 bool btrfs_find_first_extent_bit(struct extent_io_tree *tree, u64 start,
                                 u64 *start_ret, u64 *end_ret, u32 bits,

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index a982fd64b814402390d12a2636c151f8c809854c..34d1920a51e2d400403b7ebda70d60717cdd3bb8 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -4232,8 +4232,9 @@ static int qgroup_reserve_data(struct btrfs_inode *inode,
        reserved = *reserved_ret;
        /* Record already reserved space */
        orig_reserved = reserved->bytes_changed;
-       ret = set_record_extent_bits(&inode->io_tree, start,
-                       start + len -1, EXTENT_QGROUP_RESERVED, reserved);
+       ret = btrfs_set_record_extent_bits(&inode->io_tree, start,
+                                          start + len - 1, EXTENT_QGROUP_RESERVED,
+                                          reserved);
 
        /* Newly reserved space */
        to_reserve = reserved->bytes_changed - orig_reserved;
@@ -4326,9 +4327,10 @@ static int qgroup_free_reserved_data(struct btrfs_inode *inode,
                 * EXTENT_QGROUP_RESERVED, we won't double free.
                 * So not need to rush.
                 */
-               ret = clear_record_extent_bits(&inode->io_tree, free_start,
-                               free_start + free_len - 1,
-                               EXTENT_QGROUP_RESERVED, &changeset);
+               ret = btrfs_clear_record_extent_bits(&inode->io_tree, free_start,
+                                                    free_start + free_len - 1,
+                                                    EXTENT_QGROUP_RESERVED,
+                                                    &changeset);
                if (ret < 0)
                        goto out;
                freed += changeset.bytes_changed;
@@ -4352,9 +4354,9 @@ static int __btrfs_qgroup_release_data(struct btrfs_inode *inode,
        int ret;
 
        if (btrfs_qgroup_mode(inode->root->fs_info) == BTRFS_QGROUP_MODE_DISABLED) {
-               return clear_record_extent_bits(&inode->io_tree, start,
-                                               start + len - 1,
-                                               EXTENT_QGROUP_RESERVED, NULL);
+               return btrfs_clear_record_extent_bits(&inode->io_tree, start,
+                                                     start + len - 1,
+                                                     EXTENT_QGROUP_RESERVED, NULL);
        }
 
        /* In release case, we shouldn't have @reserved */
@@ -4362,8 +4364,8 @@ static int __btrfs_qgroup_release_data(struct btrfs_inode *inode,
        if (free && reserved)
                return qgroup_free_reserved_data(inode, reserved, start, len, released);
        extent_changeset_init(&changeset);
-       ret = clear_record_extent_bits(&inode->io_tree, start, start + len -1,
-                                      EXTENT_QGROUP_RESERVED, &changeset);
+       ret = btrfs_clear_record_extent_bits(&inode->io_tree, start, start + len - 1,
+                                            EXTENT_QGROUP_RESERVED, &changeset);
        if (ret < 0)
                goto out;
 
@@ -4611,8 +4613,8 @@ void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)
        int ret;
 
        extent_changeset_init(&changeset);
-       ret = clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,
-                       EXTENT_QGROUP_RESERVED, &changeset);
+       ret = btrfs_clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,
+                                            EXTENT_QGROUP_RESERVED, &changeset);
 
        WARN_ON(ret < 0);
        if (WARN_ON(changeset.bytes_changed)) {

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 7310e2fa85262149d9e176b195d1d4335169fefa..7d48e8d91e27a0d1aedf0f29d7d7139d9f7478ac 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2529,8 +2529,8 @@ static const struct init_sequence mod_init_seq[] = {
                .init_func = btrfs_free_space_init,
                .exit_func = btrfs_free_space_exit,
        }, {
-               .init_func = extent_state_init_cachep,
-               .exit_func = extent_state_free_cachep,
+               .init_func = btrfs_extent_state_init_cachep,
+               .exit_func = btrfs_extent_state_free_cachep,
        }, {
                .init_func = extent_buffer_init_cachep,
                .exit_func = extent_buffer_free_cachep,

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index ad6a7a25b9d91454fc971290916d1345860798a3..39e48bf610a1a424763ef0198806b5bbd9ac30ba 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1132,9 +1132,9 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
                                           mark, &cached_state)) {
                bool wait_writeback = false;
 
-               ret = convert_extent_bit(dirty_pages, start, end,
-                                        EXTENT_NEED_WAIT,
-                                        mark, &cached_state);
+               ret = btrfs_convert_extent_bit(dirty_pages, start, end,
+                                              EXTENT_NEED_WAIT,
+                                              mark, &cached_state);
                /*
                 * convert_extent_bit can return -ENOMEM, which is most of the
                 * time a temporary error. So when it happens, ignore the error