diff options
| author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2012-09-13 03:32:54 -0600 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-04 09:39:54 -0400 |
| commit | b4f359ab065b9c6c132124557d23e90e2e8504be (patch) | |
| tree | 2833e229bc13a2e16bffbc9e90aea4d328bfd557 /fs/btrfs | |
| parent | 0433f20d436fd040013e5a419a2e3d732d618a41 (diff) | |
| download | op-kernel-dev-b4f359ab065b9c6c132124557d23e90e2e8504be.zip op-kernel-dev-b4f359ab065b9c6c132124557d23e90e2e8504be.tar.gz | |
Btrfs: remove unnecessary code in btree_get_extent()
Unnecessary lookup_extent_mapping() is removed because an error is
returned to the caller.
This patch was made based on the advice from Stefan Behrens, thanks.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8db87bc..8d633e3 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -217,16 +217,10 @@ static struct extent_map *btree_get_extent(struct inode *inode, write_lock(&em_tree->lock); ret = add_extent_mapping(em_tree, em); if (ret == -EEXIST) { - u64 failed_start = em->start; - u64 failed_len = em->len; - free_extent_map(em); em = lookup_extent_mapping(em_tree, start, len); - if (!em) { - lookup_extent_mapping(em_tree, failed_start, - failed_len); + if (!em) em = ERR_PTR(-EIO); - } } else if (ret) { free_extent_map(em); em = ERR_PTR(ret); |
