diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2013-02-20 15:16:39 +0100 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-02-20 19:00:09 +0100 |
| commit | 272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0 (patch) | |
| tree | 52dfc880b2025ea738940ec8ebecfaaf839aba13 /fs/btrfs/transaction.c | |
| parent | Btrfs: fix missing check before disabling quota (diff) | |
| download | linux-272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0.tar.xz linux-272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0.zip | |
Btrfs: fix missing release of qgroup reservation in commit_transaction()
We forget to free qgroup reservation in commit_transaction(),fix it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Cc: Arne Jansen <sensille@gmx.net>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/transaction.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index c1ce664c0c39..955204ca0447 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1553,6 +1553,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; + if (trans->qgroup_reserved) { + btrfs_qgroup_free(root, trans->qgroup_reserved); + trans->qgroup_reserved = 0; + } cur_trans = trans->transaction; @@ -1833,6 +1837,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, cleanup_transaction: btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; + if (trans->qgroup_reserved) { + btrfs_qgroup_free(root, trans->qgroup_reserved); + trans->qgroup_reserved = 0; + } btrfs_printk(root->fs_info, "Skipping commit of aborted transaction.\n"); // WARN_ON(1); if (current->journal_info == trans) |