Skip to content

Commit

Permalink
Btrfs: cleanup of error processing in btree_get_extent()
Browse files Browse the repository at this point in the history
This patch simplifies a little complex error processing in
btree_get_extent().

Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
  • Loading branch information
Tsutomu Itoh authored and Chris Mason committed Oct 4, 2012
1 parent 90abccf commit 0433f20
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
failed_len);
ret = -EIO;
if (!em) {
lookup_extent_mapping(em_tree, failed_start,
failed_len);
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;
}
Expand Down

0 comments on commit 0433f20

Please sign in to comment.