btrfs: rename free_extent_state() to include a btrfs prefix

This is an exported function so it should have a 'btrfs_' prefix by
convention, to make it clear it's btrfs specific and to avoid collisions
with functions from elsewhere in the kernel.

Rename the function to add 'btrfs_' prefix to it.

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/dev-replace.c b/fs/btrfs/dev-replace.c
index 55608ac8dbe02a47a4dfd1cb95f80dc36cb82f2e..483e71e09181ff9202bae812ec8f83cf66915d2e 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -804,7 +804,7 @@ static int btrfs_set_target_alloc_state(struct btrfs_device *srcdev,
                start = found_end + 1;
        }
 
-       free_extent_state(cached_state);
+       btrfs_free_extent_state(cached_state);
        return ret;
 }
 

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 1464e36eceac2d093efb30add5d6ed501ba56f5c..5ee05955d004f16a4a90e3be9aaa6cb5cab689f3 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4734,7 +4734,7 @@ static void btrfs_destroy_pinned_extent(struct btrfs_fs_info *fs_info,
                }
 
                btrfs_clear_extent_dirty(unpin, start, end, &cached_state);
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
                btrfs_error_unpin_extent_range(fs_info, start, end);
                mutex_unlock(&fs_info->unused_bg_unpin_mutex);
                cond_resched();

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index 835a9463f687aa6bd09138a97aa2d5f99d39d5f6..6317004f36c4f052ec0ba0906c889dbe15f47b35 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -130,7 +130,7 @@ void btrfs_extent_io_tree_release(struct extent_io_tree *tree)
                 * (see wait_extent_bit()).
                 */
                ASSERT(!waitqueue_active(&state->wq));
-               free_extent_state(state);
+               btrfs_free_extent_state(state);
                cond_resched_lock(&tree->lock);
        }
        /*
@@ -170,7 +170,7 @@ static struct extent_state *alloc_extent_state_atomic(struct extent_state *preal
        return prealloc;
 }
 
-void free_extent_state(struct extent_state *state)
+void btrfs_free_extent_state(struct extent_state *state)
 {
        if (!state)
                return;
@@ -349,7 +349,7 @@ static void merge_prev_state(struct extent_io_tree *tree, struct extent_state *s
                state->start = prev->start;
                rb_erase(&prev->rb_node, &tree->state);
                RB_CLEAR_NODE(&prev->rb_node);
-               free_extent_state(prev);
+               btrfs_free_extent_state(prev);
        }
 }
 
@@ -364,7 +364,7 @@ static void merge_next_state(struct extent_io_tree *tree, struct extent_state *s
                state->end = next->end;
                rb_erase(&next->rb_node, &tree->state);
                RB_CLEAR_NODE(&next->rb_node);
-               free_extent_state(next);
+               btrfs_free_extent_state(next);
        }
 }
 
@@ -526,7 +526,7 @@ static int split_state(struct extent_io_tree *tree, struct extent_state *orig,
                } else if (prealloc->end > entry->end) {
                        node = &(*node)->rb_right;
                } else {
-                       free_extent_state(prealloc);
+                       btrfs_free_extent_state(prealloc);
                        return -EEXIST;
                }
        }
@@ -566,7 +566,7 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree,
                if (extent_state_in_tree(state)) {
                        rb_erase(&state->rb_node, &tree->state);
                        RB_CLEAR_NODE(&state->rb_node);
-                       free_extent_state(state);
+                       btrfs_free_extent_state(state);
                } else {
                        WARN_ON(1);
                }
@@ -652,7 +652,7 @@ again:
                        goto hit_next;
                }
                if (clear)
-                       free_extent_state(cached);
+                       btrfs_free_extent_state(cached);
        }
 
        /* This search will find the extents that end after our range starts. */
@@ -744,7 +744,7 @@ search_again:
 out:
        spin_unlock(&tree->lock);
        if (prealloc)
-               free_extent_state(prealloc);
+               btrfs_free_extent_state(prealloc);
 
        return 0;
 
@@ -796,7 +796,7 @@ process_node:
                        schedule();
                        spin_lock(&tree->lock);
                        finish_wait(&state->wq, &wait);
-                       free_extent_state(state);
+                       btrfs_free_extent_state(state);
                        goto again;
                }
                start = state->end + 1;
@@ -814,7 +814,7 @@ out:
        if (cached_state && *cached_state) {
                state = *cached_state;
                *cached_state = NULL;
-               free_extent_state(state);
+               btrfs_free_extent_state(state);
        }
        spin_unlock(&tree->lock);
 }
@@ -890,13 +890,13 @@ bool btrfs_find_first_extent_bit(struct extent_io_tree *tree, u64 start,
                         * again. If we haven't found any, clear as well since
                         * it's now useless.
                         */
-                       free_extent_state(*cached_state);
+                       btrfs_free_extent_state(*cached_state);
                        *cached_state = NULL;
                        if (state)
                                goto got_it;
                        goto out;
                }
-               free_extent_state(*cached_state);
+               btrfs_free_extent_state(*cached_state);
                *cached_state = NULL;
        }
 
@@ -1249,7 +1249,7 @@ search_again:
 out:
        spin_unlock(&tree->lock);
        if (prealloc)
-               free_extent_state(prealloc);
+               btrfs_free_extent_state(prealloc);
 
        return ret;
 
@@ -1474,7 +1474,7 @@ search_again:
 out:
        spin_unlock(&tree->lock);
        if (prealloc)
-               free_extent_state(prealloc);
+               btrfs_free_extent_state(prealloc);
 
        return ret;
 }
@@ -1686,7 +1686,7 @@ search:
        }
 
        if (cached_state) {
-               free_extent_state(*cached_state);
+               btrfs_free_extent_state(*cached_state);
                *cached_state = state;
                if (state)
                        refcount_inc(&state->refs);

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index 2f5e27d96acdecc60db590b28fd8505e5c882f84..238732b23e93f634fabfa126a7328ed29207a994 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -165,7 +165,7 @@ u64 btrfs_count_range_bits(struct extent_io_tree *tree,
                           u64 max_bytes, u32 bits, int contig,
                           struct extent_state **cached_state);
 
-void free_extent_state(struct extent_state *state);
+void btrfs_free_extent_state(struct extent_state *state);
 bool btrfs_test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, u32 bit,
                          struct extent_state *cached_state);
 bool btrfs_test_range_bit_exists(struct extent_io_tree *tree, u64 start, u64 end, u32 bit);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7ca5cfaccbfd66e7826308395f4770fe15a78e51..266a159fe5bb3949745a7a221b3487a58cc9fc90 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2843,7 +2843,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
                ret = unpin_extent_range(fs_info, start, end, true);
                BUG_ON(ret);
                mutex_unlock(&fs_info->unused_bg_unpin_mutex);
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
                cond_resched();
        }
 

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d63e535229091e081e8160bbfc0f356560d01e76..95904a7beaa03d7b42933a18b31537516b455293 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -332,7 +332,7 @@ again:
 
                /* @delalloc_end can be -1, never go beyond @orig_end */
                *end = min(delalloc_end, orig_end);
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
                return false;
        }
 
@@ -358,7 +358,7 @@ again:
                /* some of the folios are gone, lets avoid looping by
                 * shortening the size of the delalloc range we're searching
                 */
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
                cached_state = NULL;
                if (!loops) {
                        max_bytes = PAGE_SIZE;
@@ -2644,7 +2644,7 @@ static bool try_release_extent_state(struct extent_io_tree *tree,
        if (ret2 == 0)
                ret = true;
 out:
-       free_extent_state(cached_state);
+       btrfs_free_extent_state(cached_state);
 
        return ret;
 }

diff --git a/fs/btrfs/fiemap.c b/fs/btrfs/fiemap.c
index ba65a4821c445ca2ad330d531d887d6e7f27dd3f..43bf0979fd53943b5bf563a329cf7a0dd965e976 100644 (file)
--- a/fs/btrfs/fiemap.c
+++ b/fs/btrfs/fiemap.c
@@ -871,7 +871,7 @@ out_unlock:
 
        ret = emit_last_fiemap_cache(fieinfo, &cache);
 out:
-       free_extent_state(delalloc_cached_state);
+       btrfs_free_extent_state(delalloc_cached_state);
        kfree(cache.entries);
        btrfs_free_backref_share_ctx(backref_ctx);
        return ret;

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 23f3b1b7a6173ca23911205cd96cee40adbeaed9..96cb1b17e06e7e5762ec4555508a7b5a4ef9a6dc 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1288,7 +1288,7 @@ again:
                                btrfs_unlock_extent(&inode->io_tree, lockstart, lockend,
                                                    &cached_state);
                        else
-                               free_extent_state(cached_state);
+                               btrfs_free_extent_state(cached_state);
                        btrfs_delalloc_release_extents(inode, reserved_len);
                        release_space(inode, *data_reserved, reserved_start, reserved_len,
                                      only_release_metadata);
@@ -1317,7 +1317,7 @@ again:
        if (extents_locked)
                btrfs_unlock_extent(&inode->io_tree, lockstart, lockend, &cached_state);
        else
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
 
        btrfs_delalloc_release_extents(inode, reserved_len);
        if (ret) {
@@ -1469,7 +1469,7 @@ int btrfs_release_file(struct inode *inode, struct file *filp)
 
        if (private) {
                kfree(private->filldir_buf);
-               free_extent_state(private->llseek_cached_state);
+               btrfs_free_extent_state(private->llseek_cached_state);
                kfree(private);
                filp->private_data = NULL;
        }

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index c640e80d2a20b95dd6eb90316280b423c5baa790..ad6a7a25b9d91454fc971290916d1345860798a3 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1156,7 +1156,7 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
                        ret = filemap_fdatawrite_range(mapping, start, end);
                if (!ret && wait_writeback)
                        ret = filemap_fdatawait_range(mapping, start, end);
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
                if (ret)
                        break;
                cached_state = NULL;
@@ -1197,7 +1197,7 @@ static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info,
                        ret = 0;
                if (!ret)
                        ret = filemap_fdatawait_range(mapping, start, end);
-               free_extent_state(cached_state);
+               btrfs_free_extent_state(cached_state);
                if (ret)
                        break;
                cached_state = NULL;