aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2012-12-05 05:53:25 -0500
committerChris Mason <chris.mason@fusionio.com>2012-12-16 20:46:18 -0500
commit4b5829a8e3104c8bc115d926a0285d3ff9bcfc77 (patch)
tree7d2c5060f86f850d4bfc9d6495ca7fe95b14f6da /fs/btrfs/extent-tree.c
parent543eabd5e1929bc73e22b279aa911eb01447535f (diff)
Btrfs: fix missing reserved space release in error path of delalloc reservation
We forget to release the reserved space in the error path of delalloc reservatiom, fix it. Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 98af8379895a..e15280989188 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4559,6 +4559,9 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
4559 ret = btrfs_qgroup_reserve(root, num_bytes + 4559 ret = btrfs_qgroup_reserve(root, num_bytes +
4560 nr_extents * root->leafsize); 4560 nr_extents * root->leafsize);
4561 if (ret) { 4561 if (ret) {
4562 spin_lock(&BTRFS_I(inode)->lock);
4563 calc_csum_metadata_size(inode, num_bytes, 0);
4564 spin_unlock(&BTRFS_I(inode)->lock);
4562 mutex_unlock(&BTRFS_I(inode)->delalloc_mutex); 4565 mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
4563 return ret; 4566 return ret;
4564 } 4567 }
@@ -4594,6 +4597,10 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
4594 btrfs_ino(inode), 4597 btrfs_ino(inode),
4595 to_free, 0); 4598 to_free, 0);
4596 } 4599 }
4600 if (root->fs_info->quota_enabled) {
4601 btrfs_qgroup_free(root, num_bytes +
4602 nr_extents * root->leafsize);
4603 }
4597 mutex_unlock(&BTRFS_I(inode)->delalloc_mutex); 4604 mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
4598 return ret; 4605 return ret;
4599 } 4606 }