Commit 543068a2 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 453e4873

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -4778,7 +4778,7 @@ int btrfs_init_root_free_objectid(struct btrfs_root *root) 
	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);

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/free-space-cache.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;