openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Btrfs: Fix a few functions that exit without stopping their transaction 

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Josef Bacik 2008-07-24 12:17:14 -04:00 committed by Chris Mason
parent 7b12876623
commit 8e8a1e31f2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/extent-tree.c
View File

@ -3275,8 +3275,10 @@ int btrfs_shrink_extent_tree(struct btrfs_root *root, u64 shrink_start)
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret > 0)
ret = -EIO;
if (ret < 0)
if (ret < 0) {
btrfs_end_transaction(trans, root);
goto out;
}
clear_extent_bits(&info->block_group_cache, key.objectid,
key.objectid + key.offset - 1,

6
fs/btrfs/ioctl.c
View File

@ -78,8 +78,10 @@ static noinline int create_subvol(struct btrfs_root *root, char *name,
leaf = btrfs_alloc_free_block(trans, root, root->leafsize,
objectid, trans->transid, 0, 0,
0, 0);
if (IS_ERR(leaf))
return PTR_ERR(leaf);
if (IS_ERR(leaf)) {
ret = PTR_ERR(leaf);
goto fail;
}
btrfs_set_header_nritems(leaf, 0);
btrfs_set_header_level(leaf, 0);