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 <viro@zeniv.linux.org.uk>
Reviewed-by: David Sterba <dsterba@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7e56a203c109d07cd0d351d026ad686c7995b5ef..cd99ce8583a8d5d878e552d7c5c344331b015ca1 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3771,7 +3771,6 @@ cache_acl:
 
 make_bad:
        btrfs_free_path(path);
-       make_bad_inode(inode);
        return ret;
 }
 
@@ -5697,12 +5696,13 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
                int ret;
 
                ret = btrfs_read_locked_inode(inode);
-               if (!is_bad_inode(inode)) {
+               if (!ret) {
                        inode_tree_add(inode);
                        unlock_new_inode(inode);
                        if (new)
                                *new = 1;
                } else {
+                       make_bad_inode(inode);
                        unlock_new_inode(inode);
                        iput(inode);
                        ASSERT(ret < 0);