Btrfs: fix missing reserved space release in error path of delalloc reservation
authorMiao Xie <miaox@cn.fujitsu.com>
Wed, 5 Dec 2012 10:53:25 +0000 (10:53 +0000)
committerChris Mason <chris.mason@fusionio.com>
Mon, 17 Dec 2012 01:46:18 +0000 (20:46 -0500)
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>
fs/btrfs/extent-tree.c

index 98af8379895aa21e8d0cf1522d699d92eeed65ba..e1528098918857107e79e50fae5f72c241d17cf3 100644 (file)
@@ -4559,6 +4559,9 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
                ret = btrfs_qgroup_reserve(root, num_bytes +
                                           nr_extents * root->leafsize);
                if (ret) {
+                       spin_lock(&BTRFS_I(inode)->lock);
+                       calc_csum_metadata_size(inode, num_bytes, 0);
+                       spin_unlock(&BTRFS_I(inode)->lock);
                        mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
                        return ret;
                }
@@ -4594,6 +4597,10 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
                                                      btrfs_ino(inode),
                                                      to_free, 0);
                }
+               if (root->fs_info->quota_enabled) {
+                       btrfs_qgroup_free(root, num_bytes +
+                                               nr_extents * root->leafsize);
+               }
                mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
                return ret;
        }