marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix leak in btrfs_drop_snapshot

master
Chris Mason 2007-03-12 09:03:27 -04:00 committed by David Woodhouse
parent 84084892fb
commit 2db1ff3570
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-io.c
View File

@ -167,7 +167,7 @@ int commit_transaction(struct ctree_root *root, struct ctree_super_block *s)
root->node->count++; root->node->count++;
ret = btrfs_drop_snapshot(root, snap); ret = btrfs_drop_snapshot(root, snap);
BUG_ON(ret); BUG_ON(ret);
tree_block_release(root, snap); // tree_block_release(root, snap);
} }
write_ctree_super(root, s); write_ctree_super(root, s);
btrfs_finish_extent_commit(root); btrfs_finish_extent_commit(root);

11
extent-tree.c
View File

@ -441,15 +441,15 @@ int walk_down_tree(struct ctree_root *root, struct ctree_path *path, int *level)
} }
BUG_ON(ret); BUG_ON(ret);
next = read_tree_block(root, blocknr); next = read_tree_block(root, blocknr);
if (path->nodes[*level-1]) { if (path->nodes[*level-1])
tree_block_release(root, path->nodes[*level-1]); tree_block_release(root, path->nodes[*level-1]);
}
path->nodes[*level-1] = next; path->nodes[*level-1] = next;
*level = node_level(next->node.header.flags); *level = node_level(next->node.header.flags);
path->slots[*level] = 0; path->slots[*level] = 0;
} }
out: out:
ret = free_extent(root, path->nodes[*level]->blocknr, 1); ret = free_extent(root, path->nodes[*level]->blocknr, 1);
tree_block_release(root, path->nodes[*level]);
path->nodes[*level] = NULL; path->nodes[*level] = NULL;
*level += 1; *level += 1;
BUG_ON(ret); BUG_ON(ret);
@ -470,6 +470,8 @@ int walk_up_tree(struct ctree_root *root, struct ctree_path *path, int *level)
} else { } else {
ret = free_extent(root, ret = free_extent(root,
path->nodes[*level]->blocknr, 1); path->nodes[*level]->blocknr, 1);
tree_block_release(root, path->nodes[*level]);
path->nodes[*level] = NULL;
*level = i + 1; *level = i + 1;
BUG_ON(ret); BUG_ON(ret);
} }
@ -499,9 +501,10 @@ int btrfs_drop_snapshot(struct ctree_root *root, struct tree_buffer *snap)
if (ret > 0) if (ret > 0)
break; break;
} }
for (i = 0; i < orig_level; i++) { for (i = 0; i <= orig_level; i++) {
if (path.nodes[i]) if (path.nodes[i]) {
tree_block_release(root, path.nodes[i]); tree_block_release(root, path.nodes[i]);
}
} }
return 0; return 0;