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

Commit 0433f20d authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Chris Mason
Browse files

Btrfs: cleanup of error processing in btree_get_extent() 



This patch simplifies a little complex error processing in
btree_get_extent().

Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
parent 90abccf2

fs/btrfs/disk-io.c

+5 −9
Original line number Diff line number Diff line
@@ -222,21 +222,17 @@ static struct extent_map *btree_get_extent(struct inode *inode, 


		free_extent_map(em);

		em = lookup_extent_mapping(em_tree, start, len);

		if (em) {

			ret = 0;

		} else {

			em = lookup_extent_mapping(em_tree, failed_start,

		if (!em) {

			lookup_extent_mapping(em_tree, failed_start,

					      failed_len);

			ret = -EIO;

			em = ERR_PTR(-EIO);

		}

	} else if (ret) {

		free_extent_map(em);

		em = NULL;

		em = ERR_PTR(ret);

	}

	write_unlock(&em_tree->lock);



	if (ret)

		em = ERR_PTR(ret);

out:

	return em;

}