---

yaml --- r: 179623 b: refs/heads/master c: 2423fdf h: refs/heads/master i: 179621: c3de229 179619: 1d26444 179615: 5980582 v: v3
git-mirror · Jan 18, 2010 · 4ea3c40 · 4ea3c40
1 parent 08dab29
commit 4ea3c40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a038fab0cb873c75d6675e2bcffce8a3935bdce7
+refs/heads/master: 2423fdfb96e3f9ff3baeb6c4c78d74145547891d
diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c
@@ -3281,8 +3281,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
 		return -ENOMEM;
 
 	path = btrfs_alloc_path();
-	if (!path)
+	if (!path) {
+		kfree(cluster);
 		return -ENOMEM;
+	}
 
 	rc->extents_found = 0;
 	rc->extents_skipped = 0;

diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
@@ -2649,8 +2649,10 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw,
 	em = lookup_extent_mapping(em_tree, logical, *length);
 	read_unlock(&em_tree->lock);
 
-	if (!em && unplug_page)
+	if (!em && unplug_page) {
+		kfree(multi);
 		return 0;
+	}
 
 	if (!em) {
 		printk(KERN_CRIT "unable to find logical %llu len %llu\n",