summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorTsutomu Itoh <t-itoh@jp.fujitsu.com>2012-02-16 16:23:58 +0900
committerDavid Sterba <dsterba@suse.cz>2012-02-16 17:23:17 +0100
commit285190d99fef696ec8b0041787387f013cb71d67 (patch)
treed55c5e3f71718cb21f9349280fb160d0403d082d /fs/btrfs/volumes.c
parent600a45e1d5e376f679ff9ecc4ce9452710a6d27c (diff)
downloadlinux-stable-285190d99fef696ec8b0041787387f013cb71d67.tar.gz
linux-stable-285190d99fef696ec8b0041787387f013cb71d67.tar.bz2
linux-stable-285190d99fef696ec8b0041787387f013cb71d67.zip
Btrfs: check return value of lookup_extent_mapping() correctly
This patch corrects error checking of lookup_extent_mapping(). Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d8f282b5baa9..cd040bf3fd87 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1954,7 +1954,7 @@ static int btrfs_relocate_chunk(struct btrfs_root *root,
em = lookup_extent_mapping(em_tree, chunk_offset, 1);
read_unlock(&em_tree->lock);
- BUG_ON(em->start > chunk_offset ||
+ BUG_ON(!em || em->start > chunk_offset ||
em->start + em->len < chunk_offset);
map = (struct map_lookup *)em->bdev;