kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Btrfs: fix cache_block_group error handling

Browse source 
cache block group had a few bugs in the error handling code,
this makes sure paths get properly released and the correct return value
goes out.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Josef Bacik 2008-09-23 13:14:11 -04:00 committed by Chris Mason
parent f25956cc58
commit ef8bbdfe7e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/btrfs/extent-tree.c
View file

@ -66,7 +66,7 @@ static int cache_block_group(struct btrfs_root *root,
struct btrfs_block_group_cache *block_group) struct btrfs_block_group_cache *block_group)
{ {
struct btrfs_path *path; struct btrfs_path *path;
int ret; int ret = 0;
struct btrfs_key key; struct btrfs_key key;
struct extent_buffer *leaf; struct extent_buffer *leaf;
struct extent_io_tree *free_space_cache; struct extent_io_tree *free_space_cache;
@ -102,10 +102,10 @@ static int cache_block_group(struct btrfs_root *root,
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
if (ret < 0) if (ret < 0)
return ret; goto err;
ret = btrfs_previous_item(root, path, 0, BTRFS_EXTENT_ITEM_KEY); ret = btrfs_previous_item(root, path, 0, BTRFS_EXTENT_ITEM_KEY);
if (ret < 0) if (ret < 0)
return ret; goto err;
if (ret == 0) { if (ret == 0) {
leaf = path->nodes[0]; leaf = path->nodes[0];
btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
@ -161,9 +161,10 @@ next:
last + hole_size - 1, GFP_NOFS); last + hole_size - 1, GFP_NOFS);
} }
block_group->cached = 1; block_group->cached = 1;
ret = 0;
err: err:
btrfs_free_path(path); btrfs_free_path(path);
return 0; return ret;
} }
struct btrfs_block_group_cache *btrfs_lookup_first_block_group(struct struct btrfs_block_group_cache *btrfs_lookup_first_block_group(struct