Skip to content

Commit 2e19f1f

Browse files
Al Virokdave
authored andcommitted
btrfs: btrfs_iget never returns an is_bad_inode inode
Just get rid of pointless checks. Signed-off-by: Al Viro <[email protected]> Reviewed-by: Nikolay Borisov <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 1e7e1f9 commit 2e19f1f

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

fs/btrfs/free-space-cache.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
7171
inode = btrfs_iget(fs_info->sb, &location, root, NULL);
7272
if (IS_ERR(inode))
7373
return inode;
74-
if (is_bad_inode(inode)) {
75-
iput(inode);
76-
return ERR_PTR(-ENOENT);
77-
}
7874

7975
mapping_set_gfp_mask(inode->i_mapping,
8076
mapping_gfp_constraint(inode->i_mapping,

fs/btrfs/relocation.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3470,11 +3470,8 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info,
34703470
key.offset = 0;
34713471

34723472
inode = btrfs_iget(fs_info->sb, &key, root, NULL);
3473-
if (IS_ERR(inode) || is_bad_inode(inode)) {
3474-
if (!IS_ERR(inode))
3475-
iput(inode);
3473+
if (IS_ERR(inode))
34763474
return -ENOENT;
3477-
}
34783475

34793476
truncate:
34803477
ret = btrfs_check_trunc_cache_free_space(fs_info,
@@ -4155,7 +4152,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
41554152
key.type = BTRFS_INODE_ITEM_KEY;
41564153
key.offset = 0;
41574154
inode = btrfs_iget(fs_info->sb, &key, root, NULL);
4158-
BUG_ON(IS_ERR(inode) || is_bad_inode(inode));
4155+
BUG_ON(IS_ERR(inode));
41594156
BTRFS_I(inode)->index_cnt = group->key.objectid;
41604157

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

fs/btrfs/tree-log.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -545,12 +545,8 @@ static noinline struct inode *read_one_inode(struct btrfs_root *root,
545545
key.type = BTRFS_INODE_ITEM_KEY;
546546
key.offset = 0;
547547
inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
548-
if (IS_ERR(inode)) {
548+
if (IS_ERR(inode))
549549
inode = NULL;
550-
} else if (is_bad_inode(inode)) {
551-
iput(inode);
552-
inode = NULL;
553-
}
554550
return inode;
555551
}
556552

0 commit comments

Comments
 (0)