diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index df731c0ebec7..8078077d1090 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -5263,7 +5263,7 @@ void btrfs_evict_inode(struct inode *inode) | |||
5263 | if (steal_from_global) { | 5263 | if (steal_from_global) { |
5264 | if (!btrfs_check_space_for_delayed_refs(trans, root)) | 5264 | if (!btrfs_check_space_for_delayed_refs(trans, root)) |
5265 | ret = btrfs_block_rsv_migrate(global_rsv, rsv, | 5265 | ret = btrfs_block_rsv_migrate(global_rsv, rsv, |
5266 | min_size); | 5266 | min_size, 0); |
5267 | else | 5267 | else |
5268 | ret = -ENOSPC; | 5268 | ret = -ENOSPC; |
5269 | } | 5269 | } |
@@ -9116,7 +9116,7 @@ static int btrfs_truncate(struct inode *inode) | |||
9116 | 9116 | ||
9117 | /* Migrate the slack space for the truncate to our reserve */ | 9117 | /* Migrate the slack space for the truncate to our reserve */ |
9118 | ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, rsv, | 9118 | ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, rsv, |
9119 | min_size); | 9119 | min_size, 0); |
9120 | BUG_ON(ret); | 9120 | BUG_ON(ret); |
9121 | 9121 | ||
9122 | /* | 9122 | /* |
@@ -9156,7 +9156,7 @@ static int btrfs_truncate(struct inode *inode) | |||
9156 | } | 9156 | } |
9157 | 9157 | ||
9158 | ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, | 9158 | ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, |
9159 | rsv, min_size); | 9159 | rsv, min_size, 0); |
9160 | BUG_ON(ret); /* shouldn't happen */ | 9160 | BUG_ON(ret); /* shouldn't happen */ |
9161 | trans->block_rsv = rsv; | 9161 | trans->block_rsv = rsv; |
9162 | } | 9162 | } |
@@ -9177,7 +9177,6 @@ static int btrfs_truncate(struct inode *inode) | |||
9177 | ret = btrfs_end_transaction(trans, root); | 9177 | ret = btrfs_end_transaction(trans, root); |
9178 | btrfs_btree_balance_dirty(root); | 9178 | btrfs_btree_balance_dirty(root); |
9179 | } | 9179 | } |
9180 | |||
9181 | out: | 9180 | out: |
9182 | btrfs_free_block_rsv(root, rsv); | 9181 | btrfs_free_block_rsv(root, rsv); |
9183 | 9182 | ||