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

Commit 2e19f1f9 authored by Al Viro's avatar Al Viro Committed by David Sterba
Browse files

btrfs: btrfs_iget never returns an is_bad_inode inode 



Just get rid of pointless checks.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Reviewed-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 1e7e1f9e

fs/btrfs/free-space-cache.c

+0 −4
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root, 
	inode = btrfs_iget(fs_info->sb, &location, root, NULL);

	if (IS_ERR(inode))

		return inode;

	if (is_bad_inode(inode)) {

		iput(inode);

		return ERR_PTR(-ENOENT);

	}



	mapping_set_gfp_mask(inode->i_mapping,

			mapping_gfp_constraint(inode->i_mapping,

fs/btrfs/relocation.c

+2 −5
Original line number Diff line number Diff line
@@ -3470,11 +3470,8 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info, 
	key.offset = 0;



	inode = btrfs_iget(fs_info->sb, &key, root, NULL);

	if (IS_ERR(inode) || is_bad_inode(inode)) {

		if (!IS_ERR(inode))

			iput(inode);

	if (IS_ERR(inode))

		return -ENOENT;

	}



truncate:

	ret = btrfs_check_trunc_cache_free_space(fs_info,
@@ -4155,7 +4152,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info, 
	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	inode = btrfs_iget(fs_info->sb, &key, root, NULL);

	BUG_ON(IS_ERR(inode) || is_bad_inode(inode));

	BUG_ON(IS_ERR(inode));

	BTRFS_I(inode)->index_cnt = group->key.objectid;



	err = btrfs_orphan_add(trans, BTRFS_I(inode));

fs/btrfs/tree-log.c

+1 −5
Original line number Diff line number Diff line
@@ -545,12 +545,8 @@ static noinline struct inode *read_one_inode(struct btrfs_root *root, 
	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);

	if (IS_ERR(inode)) {

	if (IS_ERR(inode))

		inode = NULL;

	} else if (is_bad_inode(inode)) {

		iput(inode);

		inode = NULL;

	}

	return inode;

}