|
@@ -72,8 +72,7 @@ enum {
|
|
|
RESERVE_ALLOC_NO_ACCOUNT = 2,
|
|
|
};
|
|
|
|
|
|
-static int update_block_group(struct btrfs_trans_handle *trans,
|
|
|
- struct btrfs_root *root,
|
|
|
+static int update_block_group(struct btrfs_root *root,
|
|
|
u64 bytenr, u64 num_bytes, int alloc);
|
|
|
static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
|
|
|
struct btrfs_root *root,
|
|
@@ -4762,8 +4761,7 @@ void btrfs_delalloc_release_space(struct inode *inode, u64 num_bytes)
|
|
|
btrfs_free_reserved_data_space(inode, num_bytes);
|
|
|
}
|
|
|
|
|
|
-static int update_block_group(struct btrfs_trans_handle *trans,
|
|
|
- struct btrfs_root *root,
|
|
|
+static int update_block_group(struct btrfs_root *root,
|
|
|
u64 bytenr, u64 num_bytes, int alloc)
|
|
|
{
|
|
|
struct btrfs_block_group_cache *cache = NULL;
|
|
@@ -5312,7 +5310,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ret = update_block_group(trans, root, bytenr, num_bytes, 0);
|
|
|
+ ret = update_block_group(root, bytenr, num_bytes, 0);
|
|
|
if (ret) {
|
|
|
btrfs_abort_transaction(trans, extent_root, ret);
|
|
|
goto out;
|
|
@@ -6134,7 +6132,7 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
|
|
|
btrfs_mark_buffer_dirty(path->nodes[0]);
|
|
|
btrfs_free_path(path);
|
|
|
|
|
|
- ret = update_block_group(trans, root, ins->objectid, ins->offset, 1);
|
|
|
+ ret = update_block_group(root, ins->objectid, ins->offset, 1);
|
|
|
if (ret) { /* -ENOENT, logic error */
|
|
|
printk(KERN_ERR "btrfs update block group failed for %llu "
|
|
|
"%llu\n", (unsigned long long)ins->objectid,
|
|
@@ -6198,7 +6196,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
|
|
|
btrfs_mark_buffer_dirty(leaf);
|
|
|
btrfs_free_path(path);
|
|
|
|
|
|
- ret = update_block_group(trans, root, ins->objectid, ins->offset, 1);
|
|
|
+ ret = update_block_group(root, ins->objectid, ins->offset, 1);
|
|
|
if (ret) { /* -ENOENT, logic error */
|
|
|
printk(KERN_ERR "btrfs update block group failed for %llu "
|
|
|
"%llu\n", (unsigned long long)ins->objectid,
|