Commit c8174313 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason

Btrfs: use the global reserve when truncating the free space cache inode

We no longer use the orphan block rsv for holding the reservation for truncating
the inode, so instead use the global block rsv and check to make sure it has
enough space for us to truncate the space.  Thanks,
Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 5a77d76c
...@@ -198,14 +198,24 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root, ...@@ -198,14 +198,24 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
struct inode *inode) struct inode *inode)
{ {
struct btrfs_block_rsv *rsv; struct btrfs_block_rsv *rsv;
u64 needed_bytes;
loff_t oldsize; loff_t oldsize;
int ret = 0; int ret = 0;
rsv = trans->block_rsv; rsv = trans->block_rsv;
trans->block_rsv = root->orphan_block_rsv; trans->block_rsv = &root->fs_info->global_block_rsv;
ret = btrfs_block_rsv_check(root, root->orphan_block_rsv, 5);
if (ret) /* 1 for slack space, 1 for updating the inode */
return ret; needed_bytes = btrfs_calc_trunc_metadata_size(root, 1) +
btrfs_calc_trans_metadata_size(root, 1);
spin_lock(&trans->block_rsv->lock);
if (trans->block_rsv->reserved < needed_bytes) {
spin_unlock(&trans->block_rsv->lock);
trans->block_rsv = rsv;
return -ENOSPC;
}
spin_unlock(&trans->block_rsv->lock);
oldsize = i_size_read(inode); oldsize = i_size_read(inode);
btrfs_i_size_write(inode, 0); btrfs_i_size_write(inode, 0);
...@@ -218,13 +228,15 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root, ...@@ -218,13 +228,15 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
ret = btrfs_truncate_inode_items(trans, root, inode, ret = btrfs_truncate_inode_items(trans, root, inode,
0, BTRFS_EXTENT_DATA_KEY); 0, BTRFS_EXTENT_DATA_KEY);
trans->block_rsv = rsv;
if (ret) { if (ret) {
trans->block_rsv = rsv;
WARN_ON(1); WARN_ON(1);
return ret; return ret;
} }
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
trans->block_rsv = rsv;
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment