Commit 4a338542 authored by Josef Bacik's avatar Josef Bacik

Btrfs: set truncate block rsv's size

While debugging a different issue I noticed that we were always reserving space
when we tried to use our truncate block rsv's.  This is because they didn't have
a ->size value, so use_block_rsv just assumes there is nothing reserved and it
does a reserve_metadata_bytes.  This is because btrfs_check_block_rsv() doesn't
actually add to the size of the block rsv.  That seems to be the right thing to
do so set ->size to the minimum truncate size we need, since we will always only
refill to that size anyway, and this way everything works out correctly.
Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent 7f701508
...@@ -3561,6 +3561,7 @@ void btrfs_evict_inode(struct inode *inode) ...@@ -3561,6 +3561,7 @@ void btrfs_evict_inode(struct inode *inode)
btrfs_orphan_del(NULL, inode); btrfs_orphan_del(NULL, inode);
goto no_delete; goto no_delete;
} }
rsv->size = min_size;
btrfs_i_size_write(inode, 0); btrfs_i_size_write(inode, 0);
...@@ -6530,6 +6531,7 @@ static int btrfs_truncate(struct inode *inode) ...@@ -6530,6 +6531,7 @@ static int btrfs_truncate(struct inode *inode)
rsv = btrfs_alloc_block_rsv(root); rsv = btrfs_alloc_block_rsv(root);
if (!rsv) if (!rsv)
return -ENOMEM; return -ENOMEM;
rsv->size = min_size;
/* /*
* 1 for the truncate slack space * 1 for the truncate slack space
......
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