btrfs: fix race between quota disable and quota assign ioctls

[platform/kernel/linux-rpi.git] / fs / btrfs / delalloc-space.c

diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c
index 2059d15..b934429 100644 (file)
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -143,10 +143,13 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode,
 
        /* Use new btrfs_qgroup_reserve_data to reserve precious data space. */
        ret = btrfs_qgroup_reserve_data(inode, reserved, start, len);
-       if (ret < 0)
+       if (ret < 0) {
                btrfs_free_reserved_data_space_noquota(fs_info, len);
-       else
+               extent_changeset_free(*reserved);
+               *reserved = NULL;
+       } else {
                ret = 0;
+       }
        return ret;
 }
 
@@ -270,7 +273,7 @@ static void calc_inode_reservations(struct btrfs_fs_info *fs_info,
                                    u64 num_bytes, u64 *meta_reserve,
                                    u64 *qgroup_reserve)
 {
-       u64 nr_extents = count_max_extents(num_bytes);
+       u64 nr_extents = count_max_extents(fs_info, num_bytes);
        u64 csum_leaves = btrfs_csum_bytes_to_leaves(fs_info, num_bytes);
        u64 inode_update = btrfs_calc_metadata_size(fs_info, 1);
 
@@ -344,7 +347,7 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes)
         * needs to free the reservation we just made.
         */
        spin_lock(&inode->lock);
-       nr_extents = count_max_extents(num_bytes);
+       nr_extents = count_max_extents(fs_info, num_bytes);
        btrfs_mod_outstanding_extents(inode, nr_extents);
        inode->csum_bytes += num_bytes;
        btrfs_calculate_inode_block_rsv_size(fs_info, inode);
@@ -407,7 +410,7 @@ void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes)
        unsigned num_extents;
 
        spin_lock(&inode->lock);
-       num_extents = count_max_extents(num_bytes);
+       num_extents = count_max_extents(fs_info, num_bytes);
        btrfs_mod_outstanding_extents(inode, -num_extents);
        btrfs_calculate_inode_block_rsv_size(fs_info, inode);
        spin_unlock(&inode->lock);
@@ -452,8 +455,11 @@ int btrfs_delalloc_reserve_space(struct btrfs_inode *inode,
        if (ret < 0)
                return ret;
        ret = btrfs_delalloc_reserve_metadata(inode, len);
-       if (ret < 0)
+       if (ret < 0) {
                btrfs_free_reserved_data_space(inode, *reserved, start, len);
+               extent_changeset_free(*reserved);
+               *reserved = NULL;
+       }
        return ret;
 }