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

Commit 9bc2ceff authored by Al Viro's avatar Al Viro Committed by David Sterba
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8d9e220c

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3771,7 +3771,6 @@ static int btrfs_read_locked_inode(struct inode *inode) 


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);