Commit 4c66e0d4 authored by David Sterba's avatar David Sterba
Browse files

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 05dbe683 ("Btrfs:
unify subvol= and subvolid= mounting") and the parameter became unused.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent baf320b9

fs/btrfs/ctree.h

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

fs/btrfs/export.c

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

fs/btrfs/file.c

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

fs/btrfs/free-space-cache.c

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

fs/btrfs/inode.c

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