GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-11 08:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix leak in btrfs_drop_snapshot

Browse source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2007-03-12 09:03:27 -04:00 • committed by David Woodhouse
parent 20524f0226
commit 83e15a28e0
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/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
fs/btrfs/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,10 +501,11 @@ 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;
} }