btrfs: rename btrfs_find_highest_objectid to btrfs_init_root_free_objectid

This function is used to initialize the in-memory
btrfs_root::highest_objectid member, which is used to get an available
objectid. Rename it to better reflect its semantics.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
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/disk-io.c b/fs/btrfs/disk-io.c
index 6b35b7e8813697e59c3e97b27e4c952a8973edfd..47646a79d3fcadff5b7647a56fcbd688f5858f2f 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1367,8 +1367,7 @@ static int btrfs_init_fs_root(struct btrfs_root *root, dev_t anon_dev)
        }
 
        mutex_lock(&root->objectid_mutex);
        }
 
        mutex_lock(&root->objectid_mutex);

-       ret = btrfs_find_highest_objectid(root,
-                                       &root->highest_objectid);
+       ret = btrfs_init_root_free_objectid(root);

        if (ret) {
                mutex_unlock(&root->objectid_mutex);
                goto fail;
        if (ret) {
                mutex_unlock(&root->objectid_mutex);
                goto fail;


@@ -2646,8 +2645,7 @@ static int __cold init_tree_roots(struct btrfs_fs_info *fs_info)
                 * No need to hold btrfs_root::objectid_mutex since the fs
                 * hasn't been fully initialised and we are the only user
                 */
                 * No need to hold btrfs_root::objectid_mutex since the fs
                 * hasn't been fully initialised and we are the only user
                 */

-               ret = btrfs_find_highest_objectid(tree_root,
-                                               &tree_root->highest_objectid);
+               ret = btrfs_init_root_free_objectid(tree_root);

                if (ret < 0) {
                        handle_error = true;
                        continue;
                if (ret < 0) {
                        handle_error = true;
                        continue;


@@ -4745,7 +4743,7 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info)
        return 0;
 }
 
        return 0;
 }
 

-int btrfs_find_highest_objectid(struct btrfs_root *root, u64 *objectid)
+int btrfs_init_root_free_objectid(struct btrfs_root *root)

 {
        struct btrfs_path *path;
        int ret;
 {
        struct btrfs_path *path;
        int ret;


@@ -4769,10 +4767,10 @@ int btrfs_find_highest_objectid(struct btrfs_root *root, u64 *objectid)
                slot = path->slots[0] - 1;
                l = path->nodes[0];
                btrfs_item_key_to_cpu(l, &found_key, slot);
                slot = path->slots[0] - 1;
                l = path->nodes[0];
                btrfs_item_key_to_cpu(l, &found_key, slot);

-               *objectid = max_t(u64, found_key.objectid,
+               root->highest_objectid = max_t(u64, found_key.objectid,

                                  BTRFS_FIRST_FREE_OBJECTID - 1);
        } else {
                                  BTRFS_FIRST_FREE_OBJECTID - 1);
        } else {

-               *objectid = BTRFS_FIRST_FREE_OBJECTID - 1;
+               root->highest_objectid = BTRFS_FIRST_FREE_OBJECTID - 1;

        }
        ret = 0;
 error:
        }
        ret = 0;
 error:

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index e45057c0c0167ae98ecd82b362353d856c71c310..5e5bc603fbdf64d86a1dd329d546fd9c3855f84b 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -134,7 +134,7 @@ int btree_lock_page_hook(struct page *page, void *data,
                                void (*flush_fn)(void *));
 int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags);
 int btrfs_find_free_objectid(struct btrfs_root *root, u64 *objectid);
                                void (*flush_fn)(void *));
 int btrfs_get_num_tolerated_disk_barrier_failures(u64 flags);
 int btrfs_find_free_objectid(struct btrfs_root *root, u64 *objectid);

-int btrfs_find_highest_objectid(struct btrfs_root *root, u64 *objectid);
+int btrfs_init_root_free_objectid(struct btrfs_root *root);

 int __init btrfs_end_io_wq_init(void);
 void __cold btrfs_end_io_wq_exit(void);
 
 int __init btrfs_end_io_wq_init(void);
 void __cold btrfs_end_io_wq_exit(void);
 

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 254c2ee43aae678390f8a3832103b58fcc9cc47b..8ee0700a980f33f4c9da593cf816ac8dcca31ad1 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -6307,8 +6307,7 @@ again:
                         * root->objectid_mutex is not acquired as log replay
                         * could only happen during mount.
                         */
                         * root->objectid_mutex is not acquired as log replay
                         * could only happen during mount.
                         */

-                       ret = btrfs_find_highest_objectid(root,
-                                                 &root->highest_objectid);
+                       ret = btrfs_init_root_free_objectid(root);

                }
 
                wc.replay_dest->log_root = NULL;
                }
 
                wc.replay_dest->log_root = NULL;