aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorYan <yanzheng@21cn.com>2007-10-29 11:41:05 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:57 -0400
commitc67cda1758130f3e437744c4c2ec4a7cc25564e3 (patch)
tree1bde8505d3652f857f02d16712df5294ee81e72f /fs
parent44ec0b7179b9bce7df1080370f51314a24a00216 (diff)
Btrfs: Fix extent_map leak in extent_bmap
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent_map.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index c44989a1e52..e4ee980cc13 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -1924,6 +1924,7 @@ sector_t extent_bmap(struct address_space *mapping, sector_t iblock,
struct inode *inode = mapping->host;
u64 start = iblock << inode->i_blkbits;
u64 end = start + (1 << inode->i_blkbits) - 1;
+ sector_t sector = 0;
struct extent_map *em;
em = get_extent(inode, NULL, 0, start, end, 0);
@@ -1932,9 +1933,12 @@ sector_t extent_bmap(struct address_space *mapping, sector_t iblock,
if (em->block_start == EXTENT_MAP_INLINE ||
em->block_start == EXTENT_MAP_HOLE)
- return 0;
+ goto out;
- return (em->block_start + start - em->start) >> inode->i_blkbits;
+ sector = (em->block_start + start - em->start) >> inode->i_blkbits;
+out:
+ free_extent_map(em);
+ return sector;
}
static int add_lru(struct extent_map_tree *tree, struct extent_buffer *eb)