btrfs: rename btrfs_find_free_objectid to btrfs_get_free_objectid

This better reflects the semantics of the function i.e no search is
performed whatsoever.

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 47646a79d3fcadff5b7647a56fcbd688f5858f2f..98384d3e41acd9109995492eb5e10641690ce8b3 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4778,7 +4778,7 @@ error:
        return ret;
 }
 
-int btrfs_find_free_objectid(struct btrfs_root *root, u64 *objectid)
+int btrfs_get_free_objectid(struct btrfs_root *root, u64 *objectid)
 {
        int ret;
        mutex_lock(&root->objectid_mutex);

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 5e5bc603fbdf64d86a1dd329d546fd9c3855f84b..9f4a2a1e3d36c06704cdc454dc0223936ec7c7f3 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -133,7 +133,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
 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);
+int btrfs_get_free_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);

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 71d0d14bc18b39305631a081e9c3e1163cde4c82..fd6ddd6b816585683a91b6a45f558a03c61cd064 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -198,7 +198,7 @@ int create_free_space_inode(struct btrfs_trans_handle *trans,
        int ret;
        u64 ino;
 
-       ret = btrfs_find_free_objectid(trans->fs_info->tree_root, &ino);
+       ret = btrfs_get_free_objectid(trans->fs_info->tree_root, &ino);
        if (ret < 0)
                return ret;
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a8e0a6b038d3efb2c53a98ae8370262cd4101369..0fe4df05006dab3f2517575bb5d6817815f27944 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6371,7 +6371,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry,
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
-       err = btrfs_find_free_objectid(root, &objectid);
+       err = btrfs_get_free_objectid(root, &objectid);
        if (err)
                goto out_unlock;
 
@@ -6435,7 +6435,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
-       err = btrfs_find_free_objectid(root, &objectid);
+       err = btrfs_get_free_objectid(root, &objectid);
        if (err)
                goto out_unlock;
 
@@ -6579,7 +6579,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
-       err = btrfs_find_free_objectid(root, &objectid);
+       err = btrfs_get_free_objectid(root, &objectid);
        if (err)
                goto out_fail;
 
@@ -9079,7 +9079,7 @@ static int btrfs_whiteout_for_rename(struct btrfs_trans_handle *trans,
        u64 objectid;
        u64 index;
 
-       ret = btrfs_find_free_objectid(root, &objectid);
+       ret = btrfs_get_free_objectid(root, &objectid);
        if (ret)
                return ret;
 
@@ -9575,7 +9575,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
-       err = btrfs_find_free_objectid(root, &objectid);
+       err = btrfs_get_free_objectid(root, &objectid);
        if (err)
                goto out_unlock;
 
@@ -9909,7 +9909,7 @@ static int btrfs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
-       ret = btrfs_find_free_objectid(root, &objectid);
+       ret = btrfs_get_free_objectid(root, &objectid);
        if (ret)
                goto out;
 

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index dde49a791f3e236e7ad7279589d4fb94da1917f2..ec83803800c5ca690356371c73bc0148d3998e9d 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -613,7 +613,7 @@ static noinline int create_subvol(struct inode *dir,
        if (!root_item)
                return -ENOMEM;
 
-       ret = btrfs_find_free_objectid(fs_info->tree_root, &objectid);
+       ret = btrfs_get_free_objectid(fs_info->tree_root, &objectid);
        if (ret)
                goto fail_free;
 

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index df63ef64c5c0dd3512eaa70aabcf0db8509abef6..2698805ebd26a1009bb0b5cae0212200346134d4 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3434,7 +3434,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
                return ERR_CAST(trans);
        }
 
-       err = btrfs_find_free_objectid(root, &objectid);
+       err = btrfs_get_free_objectid(root, &objectid);
        if (err)
                goto out;
 

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index fbf93067642ac64013bd55b4cbe02317c903d556..3bcb5444536ee2871682d9590a35e297aa479db5 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1526,7 +1526,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        ASSERT(pending->root_item);
        new_root_item = pending->root_item;
 
-       pending->error = btrfs_find_free_objectid(tree_root, &objectid);
+       pending->error = btrfs_get_free_objectid(tree_root, &objectid);
        if (pending->error)
                goto no_free_objectid;