Skip to content

Commit

Permalink
Btrfs: fix missing release of the space/qgroup reservation in start_t…
Browse files Browse the repository at this point in the history
…ransaction()

When we fail to start a transaction, we need to release the reserved free space
and qgroup space, fix it.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Reviewed-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
  • Loading branch information
Miao Xie authored and Josef Bacik committed Feb 5, 2013
1 parent 0a3404d commit 843fcf3
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,14 @@ start_transaction(struct btrfs_root *root, u64 num_items, int type,
&root->fs_info->trans_block_rsv,
num_bytes, flush);
if (ret)
return ERR_PTR(ret);
goto reserve_fail;
}
again:
h = kmem_cache_alloc(btrfs_trans_handle_cachep, GFP_NOFS);
if (!h)
return ERR_PTR(-ENOMEM);
if (!h) {
ret = -ENOMEM;
goto alloc_fail;
}

/*
* If we are JOIN_NOLOCK we're already committing a transaction and
Expand All @@ -365,11 +367,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, int type,
if (ret < 0) {
/* We must get the transaction if we are JOIN_NOLOCK. */
BUG_ON(type == TRANS_JOIN_NOLOCK);

if (type < TRANS_JOIN_NOLOCK)
sb_end_intwrite(root->fs_info->sb);
kmem_cache_free(btrfs_trans_handle_cachep, h);
return ERR_PTR(ret);
goto join_fail;
}

cur_trans = root->fs_info->running_transaction;
Expand Down Expand Up @@ -410,6 +408,19 @@ start_transaction(struct btrfs_root *root, u64 num_items, int type,
if (!current->journal_info && type != TRANS_USERSPACE)
current->journal_info = h;
return h;

join_fail:
if (type < TRANS_JOIN_NOLOCK)
sb_end_intwrite(root->fs_info->sb);
kmem_cache_free(btrfs_trans_handle_cachep, h);
alloc_fail:
if (num_bytes)
btrfs_block_rsv_release(root, &root->fs_info->trans_block_rsv,
num_bytes);
reserve_fail:
if (qgroup_reserved)
btrfs_qgroup_free(root, qgroup_reserved);
return ERR_PTR(ret);
}

struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
Expand Down

0 comments on commit 843fcf3

Please sign in to comment.