From ae86e112cb049145013555358380cf44b109a651 Mon Sep 17 00:00:00 2001 From: Tsutomu Itoh Date: Thu, 13 Sep 2012 03:32:32 -0600 Subject: [PATCH] --- yaml --- r: 332566 b: refs/heads/master c: 0433f20d436fd040013e5a419a2e3d732d618a41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a283aa33682a..a891e2d1f266 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90abccf2c6e6e9c5a5d519eaed95292afa30aa11 +refs/heads/master: 0433f20d436fd040013e5a419a2e3d732d618a41 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 8054f7ccf46a..8db87bc53d27 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -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; }