Skip to content

Commit 9bc2cef

Browse files
Al Virokdave
authored andcommitted
btrfs: lift make_bad_inode into btrfs_iget
We don't need to check is_bad_inode() after the call of btrfs_read_locked_inode() - it's exactly the same as checking return value for being non-zero. Signed-off-by: Al Viro <[email protected]> Reviewed-by: David Sterba <[email protected]> Reviewed-by: Nikolay Borisov <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 8d9e220 commit 9bc2cef

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/btrfs/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3771,7 +3771,6 @@ static int btrfs_read_locked_inode(struct inode *inode)
37713771

37723772
make_bad:
37733773
btrfs_free_path(path);
3774-
make_bad_inode(inode);
37753774
return ret;
37763775
}
37773776

@@ -5697,12 +5696,13 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
56975696
int ret;
56985697

56995698
ret = btrfs_read_locked_inode(inode);
5700-
if (!is_bad_inode(inode)) {
5699+
if (!ret) {
57015700
inode_tree_add(inode);
57025701
unlock_new_inode(inode);
57035702
if (new)
57045703
*new = 1;
57055704
} else {
5705+
make_bad_inode(inode);
57065706
unlock_new_inode(inode);
57075707
iput(inode);
57085708
ASSERT(ret < 0);

0 commit comments

Comments
 (0)