btrfs: drop unused parameter is_new from btrfs_iget

The parameter is now always set to NULL and could be dropped. The last
user was get_default_root but that got reworked in 05dbe6837b60 ("Btrfs:
unify subvol= and subvolid= mounting") and the parameter became unused.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 668524097a3c364b3737d449b7675936622625c2..b23fb083a1d5084de5a7166fc6777b81c741aa36 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2869,10 +2869,9 @@ int btrfs_drop_inode(struct inode *inode);
 int __init btrfs_init_cachep(void);
 void __cold btrfs_destroy_cachep(void);
 struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,
-                             struct btrfs_root *root, int *new,
-                             struct btrfs_path *path);
+                             struct btrfs_root *root, struct btrfs_path *path);
 struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
-                        struct btrfs_root *root, int *was_new);
+                        struct btrfs_root *root);
 struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
                                    struct page *page, size_t pg_offset,
                                    u64 start, u64 end, int create);

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index ddf28ecf17f93c248301960a4e837c171c307a92..72e312cae69d9e2576c4af40e6a700447b66004b 100644 (file)
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -87,7 +87,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       inode = btrfs_iget(sb, &key, root, NULL);
+       inode = btrfs_iget(sb, &key, root);
        if (IS_ERR(inode)) {
                err = PTR_ERR(inode);
                goto fail;
@@ -214,7 +214,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child)
 
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       return d_obtain_alias(btrfs_iget(fs_info->sb, &key, root, NULL));
+       return d_obtain_alias(btrfs_iget(fs_info->sb, &key, root));
 fail:
        btrfs_free_path(path);
        return ERR_PTR(ret);

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 25ce1b6dbda9dbcd7c13ec820286fdca3ffa6f0d..f9434fa3e387f250ea04ae17773ff151e2fbcadc 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -296,7 +296,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info,
        key.objectid = defrag->ino;
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       inode = btrfs_iget(fs_info->sb, &key, inode_root, NULL);
+       inode = btrfs_iget(fs_info->sb, &key, inode_root);
        if (IS_ERR(inode)) {
                ret = PTR_ERR(inode);
                goto cleanup;

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d54dcd0ab23058cc8fad6ef093ac0a552f00577a..85cd874e7b48a2de6feed9fd6026c0f948f26490 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -78,7 +78,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
         * sure NOFS is set to keep us from deadlocking.
         */
        nofs_flag = memalloc_nofs_save();
-       inode = btrfs_iget_path(fs_info->sb, &location, root, NULL, path);
+       inode = btrfs_iget_path(fs_info->sb, &location, root, path);
        btrfs_release_path(path);
        memalloc_nofs_restore(nofs_flag);
        if (IS_ERR(inode))

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d3f7abf50c91d2cf3fa4509cd6f2ae32f1c8be39..2ef5f542f58a93db12d00abae714ee85cc47301d 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2672,7 +2672,7 @@ static noinline int relink_extent_backref(struct btrfs_path *path,
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       inode = btrfs_iget(fs_info->sb, &key, root, NULL);
+       inode = btrfs_iget(fs_info->sb, &key, root);
        if (IS_ERR(inode)) {
                srcu_read_unlock(&fs_info->subvol_srcu, index);
                return 0;
@@ -3523,7 +3523,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                found_key.objectid = found_key.offset;
                found_key.type = BTRFS_INODE_ITEM_KEY;
                found_key.offset = 0;
-               inode = btrfs_iget(fs_info->sb, &found_key, root, NULL);
+               inode = btrfs_iget(fs_info->sb, &found_key, root);
                ret = PTR_ERR_OR_ZERO(inode);
                if (ret && ret != -ENOENT)
                        goto out;
@@ -5742,12 +5742,14 @@ static struct inode *btrfs_iget_locked(struct super_block *s,
        return inode;
 }
 
-/* Get an inode object given its location and corresponding root.
- * Returns in *is_new if the inode was read from disk
+/*
+ * Get an inode object given its location and corresponding root.
+ * Path can be preallocated to prevent recursing back to iget through
+ * allocator. NULL is also valid but may require an additional allocation
+ * later.
  */
 struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,
-                             struct btrfs_root *root, int *new,
-                             struct btrfs_path *path)
+                             struct btrfs_root *root, struct btrfs_path *path)
 {
        struct inode *inode;
 
@@ -5762,8 +5764,6 @@ struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,
                if (!ret) {
                        inode_tree_add(inode);
                        unlock_new_inode(inode);
-                       if (new)
-                               *new = 1;
                } else {
                        iget_failed(inode);
                        /*
@@ -5781,9 +5781,9 @@ struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,
 }
 
 struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
-                        struct btrfs_root *root, int *new)
+                        struct btrfs_root *root)
 {
-       return btrfs_iget_path(s, location, root, new, NULL);
+       return btrfs_iget_path(s, location, root, NULL);
 }
 
 static struct inode *new_simple_dir(struct super_block *s,
@@ -5849,7 +5849,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
                return ERR_PTR(ret);
 
        if (location.type == BTRFS_INODE_ITEM_KEY) {
-               inode = btrfs_iget(dir->i_sb, &location, root, NULL);
+               inode = btrfs_iget(dir->i_sb, &location, root);
                if (IS_ERR(inode))
                        return inode;
 
@@ -5874,7 +5874,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
                else
                        inode = new_simple_dir(dir->i_sb, &location, sub_root);
        } else {
-               inode = btrfs_iget(dir->i_sb, &location, sub_root, NULL);
+               inode = btrfs_iget(dir->i_sb, &location, sub_root);
        }
        srcu_read_unlock(&fs_info->subvol_srcu, index);
 

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 23272d9154f37720d105f2ca093fa4473229e024..589b95eb2b80ac0e3e025d5c9053977e6d54ab8c 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2462,7 +2462,7 @@ static int btrfs_search_path_in_tree_user(struct inode *inode,
                                goto out;
                        }
 
-                       temp_inode = btrfs_iget(sb, &key2, root, NULL);
+                       temp_inode = btrfs_iget(sb, &key2, root);
                        if (IS_ERR(temp_inode)) {
                                ret = PTR_ERR(temp_inode);
                                goto out;

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 1e664e0b59b80f82796f689c3abce8da0c544284..aac596300c89da7f1d4cb4855d455848acf8ebbe 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -416,11 +416,11 @@ int btrfs_subvol_inherit_props(struct btrfs_trans_handle *trans,
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       parent_inode = btrfs_iget(sb, &key, parent_root, NULL);
+       parent_inode = btrfs_iget(sb, &key, parent_root);
        if (IS_ERR(parent_inode))
                return PTR_ERR(parent_inode);
 
-       child_inode = btrfs_iget(sb, &key, root, NULL);
+       child_inode = btrfs_iget(sb, &key, root);
        if (IS_ERR(child_inode)) {
                iput(parent_inode);
                return PTR_ERR(child_inode);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 5cd42b66818cd4ab3b935b809de32aca91a3fefc..df195e2bd45fbba203faa154e1cd047a6d732290 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3560,7 +3560,7 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info,
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       inode = btrfs_iget(fs_info->sb, &key, root, NULL);
+       inode = btrfs_iget(fs_info->sb, &key, root);
        if (IS_ERR(inode))
                return -ENOENT;
 
@@ -4246,7 +4246,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
        key.objectid = objectid;
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       inode = btrfs_iget(fs_info->sb, &key, root, NULL);
+       inode = btrfs_iget(fs_info->sb, &key, root);
        BUG_ON(IS_ERR(inode));
        BTRFS_I(inode)->index_cnt = group->key.objectid;
 

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 123ac54af071a8591769bbc833e65c653c355932..27e92594a81b0478a9140c1710a3cb5db50fc4fa 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -4779,7 +4779,7 @@ static ssize_t fill_read_buf(struct send_ctx *sctx, u64 offset, u32 len)
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       inode = btrfs_iget(fs_info->sb, &key, root, NULL);
+       inode = btrfs_iget(fs_info->sb, &key, root);
        if (IS_ERR(inode))
                return PTR_ERR(inode);
 

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 843015b9a11e06c4cb4a9a43b5b1ae68d338957a..c7d78ac64b83270cab3802764148c0e765d31267 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1219,7 +1219,7 @@ static int btrfs_fill_super(struct super_block *sb,
        key.objectid = BTRFS_FIRST_FREE_OBJECTID;
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       inode = btrfs_iget(sb, &key, fs_info->fs_root, NULL);
+       inode = btrfs_iget(sb, &key, fs_info->fs_root);
        if (IS_ERR(inode)) {
                err = PTR_ERR(inode);
                goto fail_close;

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index fa35fb890bf33cbc1801d6d61a7e5a633944b30b..30a17143448dfa614ac2cabe34aeff300f0f80d3 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -559,7 +559,7 @@ static noinline struct inode *read_one_inode(struct btrfs_root *root,
        key.objectid = objectid;
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
-       inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
+       inode = btrfs_iget(root->fs_info->sb, &key, root);
        if (IS_ERR(inode))
                inode = NULL;
        return inode;
@@ -4965,7 +4965,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
                key.objectid = ino;
                key.type = BTRFS_INODE_ITEM_KEY;
                key.offset = 0;
-               inode = btrfs_iget(fs_info->sb, &key, root, NULL);
+               inode = btrfs_iget(fs_info->sb, &key, root);
                /*
                 * If the other inode that had a conflicting dir entry was
                 * deleted in the current transaction, we need to log its parent
@@ -4975,8 +4975,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
                        ret = PTR_ERR(inode);
                        if (ret == -ENOENT) {
                                key.objectid = parent;
-                               inode = btrfs_iget(fs_info->sb, &key, root,
-                                                  NULL);
+                               inode = btrfs_iget(fs_info->sb, &key, root);
                                if (IS_ERR(inode)) {
                                        ret = PTR_ERR(inode);
                                } else {
@@ -5681,7 +5680,7 @@ process_leaf:
                                continue;
 
                        btrfs_release_path(path);
-                       di_inode = btrfs_iget(fs_info->sb, &di_key, root, NULL);
+                       di_inode = btrfs_iget(fs_info->sb, &di_key, root);
                        if (IS_ERR(di_inode)) {
                                ret = PTR_ERR(di_inode);
                                goto next_dir_inode;
@@ -5807,8 +5806,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
                                cur_offset = item_size;
                        }
 
-                       dir_inode = btrfs_iget(fs_info->sb, &inode_key,
-                                              root, NULL);
+                       dir_inode = btrfs_iget(fs_info->sb, &inode_key, root);
                        /*
                         * If the parent inode was deleted, return an error to
                         * fallback to a transaction commit. This is to prevent
@@ -5882,7 +5880,7 @@ static int log_new_ancestors(struct btrfs_trans_handle *trans,
                search_key.objectid = found_key.offset;
                search_key.type = BTRFS_INODE_ITEM_KEY;
                search_key.offset = 0;
-               inode = btrfs_iget(fs_info->sb, &search_key, root, NULL);
+               inode = btrfs_iget(fs_info->sb, &search_key, root);
                if (IS_ERR(inode))
                        return PTR_ERR(inode);