Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59689830 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Greg Kroah-Hartman
Browse files

btrfs: replace calls to btrfs_find_free_ino with btrfs_find_free_objectid 



[ Upstream commit abadc1fcd72e887a8f875dabe4a07aa8c28ac8af ]

The former is going away as part of the inode map removal so switch
callers to btrfs_find_free_objectid. No functional changes since with
INODE_MAP disabled (default) find_free_objectid was called anyway.

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>
Stable-dep-of: 0004ff15ea26 ("btrfs: fix space cache inconsistency after error loading it from disk")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1e453cb5

fs/btrfs/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -6830,7 +6830,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry, 
	if (IS_ERR(trans))

		return PTR_ERR(trans);



	err = btrfs_find_free_ino(root, &objectid);

	err = btrfs_find_free_objectid(root, &objectid);

	if (err)

		goto out_unlock;
@@ -6894,7 +6894,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, 
	if (IS_ERR(trans))

		return PTR_ERR(trans);



	err = btrfs_find_free_ino(root, &objectid);

	err = btrfs_find_free_objectid(root, &objectid);

	if (err)

		goto out_unlock;
@@ -7039,7 +7039,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_ino(root, &objectid);

	err = btrfs_find_free_objectid(root, &objectid);

	if (err)

		goto out_fail;
@@ -9930,7 +9930,7 @@ static int btrfs_whiteout_for_rename(struct btrfs_trans_handle *trans, 
	u64 objectid;

	u64 index;



	ret = btrfs_find_free_ino(root, &objectid);

	ret = btrfs_find_free_objectid(root, &objectid);

	if (ret)

		return ret;
@@ -10416,7 +10416,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 
	if (IS_ERR(trans))

		return PTR_ERR(trans);



	err = btrfs_find_free_ino(root, &objectid);

	err = btrfs_find_free_objectid(root, &objectid);

	if (err)

		goto out_unlock;
@@ -10699,7 +10699,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_ino(root, &objectid);

	ret = btrfs_find_free_objectid(root, &objectid);

	if (ret)

		goto out;