]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: replace calls to btrfs_find_free_ino with btrfs_find_free_objectid
authorNikolay Borisov <nborisov@suse.com>
Thu, 26 Nov 2020 13:10:38 +0000 (15:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 30 May 2023 11:44:04 +0000 (12:44 +0100)
[ Upstream commit 1540cb4c9a2b495368e1041d952cb13e72df2850 ]

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: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: 0004ff15ea26 ("btrfs: fix space cache inconsistency after error loading it from disk")
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/inode.c

index 20c5db8ef84275eb0b76697b874ff4c9451a6011..c89e85a7da7d49e8a5f0d118e0ea11fea62de604 100644 (file)
@@ -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;