diff options
author | Josef Bacik <josef@redhat.com> | 2011-08-29 11:01:31 -0400 |
---|---|---|
committer | Josef Bacik <josef@redhat.com> | 2011-10-19 15:12:40 -0400 |
commit | 4a33854257764c2ec6337ee0c8ecafb64f8e29e1 (patch) | |
tree | 2070f0d4a53c9124d2ff44c78e13f45ae184298c /fs/btrfs/inode.c | |
parent | 7f70150896ebd1169d9c43484c8c424f755353c4 (diff) |
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: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index e40b9239660d..06ae5b173fd7 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -3561,6 +3561,7 @@ void btrfs_evict_inode(struct inode *inode) | |||
3561 | btrfs_orphan_del(NULL, inode); | 3561 | btrfs_orphan_del(NULL, inode); |
3562 | goto no_delete; | 3562 | goto no_delete; |
3563 | } | 3563 | } |
3564 | rsv->size = min_size; | ||
3564 | 3565 | ||
3565 | btrfs_i_size_write(inode, 0); | 3566 | btrfs_i_size_write(inode, 0); |
3566 | 3567 | ||
@@ -6530,6 +6531,7 @@ static int btrfs_truncate(struct inode *inode) | |||
6530 | rsv = btrfs_alloc_block_rsv(root); | 6531 | rsv = btrfs_alloc_block_rsv(root); |
6531 | if (!rsv) | 6532 | if (!rsv) |
6532 | return -ENOMEM; | 6533 | return -ENOMEM; |
6534 | rsv->size = min_size; | ||
6533 | 6535 | ||
6534 | /* | 6536 | /* |
6535 | * 1 for the truncate slack space | 6537 | * 1 for the truncate slack space |