summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_map.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-07-14 18:13:41 +0200
committerTakashi Iwai <tiwai@suse.de>2014-07-14 18:13:41 +0200
commit03fe805a098422d27cbbbad29a54ff1349da3622 (patch)
tree0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /fs/btrfs/extent_map.c
parent50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff)
parent5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff)
downloadop-kernel-dev-03fe805a098422d27cbbbad29a54ff1349da3622.zip
op-kernel-dev-03fe805a098422d27cbbbad29a54ff1349da3622.tar.gz
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'fs/btrfs/extent_map.c')
-rw-r--r--fs/btrfs/extent_map.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 1874aee..225302b 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -75,6 +75,8 @@ void free_extent_map(struct extent_map *em)
if (atomic_dec_and_test(&em->refs)) {
WARN_ON(extent_map_in_tree(em));
WARN_ON(!list_empty(&em->list));
+ if (test_bit(EXTENT_FLAG_FS_MAPPING, &em->flags))
+ kfree(em->bdev);
kmem_cache_free(extent_map_cache, em);
}
}
OpenPOWER on IntegriCloud