aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2012-12-27 04:01:19 -0500
committerJosef Bacik <jbacik@fusionio.com>2013-02-20 09:37:13 -0500
commitc53d613e5293ef248e42195bb0595502b646a5a6 (patch)
tree52ff8b551a24bd59451d42c9fa1b87c8f69ba972
parentf6373bf3dc6b78cd2c8cfba0215104003ba4a1d0 (diff)
Btrfs: kill unused argument of update_block_group
Argument 'trans' is not used any more. Signed-off-by: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
-rw-r--r--fs/btrfs/extent-tree.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a9dc12d5ac1b..a162c7cb8fb5 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -72,8 +72,7 @@ enum {
72 RESERVE_ALLOC_NO_ACCOUNT = 2, 72 RESERVE_ALLOC_NO_ACCOUNT = 2,
73}; 73};
74 74
75static int update_block_group(struct btrfs_trans_handle *trans, 75static int update_block_group(struct btrfs_root *root,
76 struct btrfs_root *root,
77 u64 bytenr, u64 num_bytes, int alloc); 76 u64 bytenr, u64 num_bytes, int alloc);
78static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 77static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
79 struct btrfs_root *root, 78 struct btrfs_root *root,
@@ -4762,8 +4761,7 @@ void btrfs_delalloc_release_space(struct inode *inode, u64 num_bytes)
4762 btrfs_free_reserved_data_space(inode, num_bytes); 4761 btrfs_free_reserved_data_space(inode, num_bytes);
4763} 4762}
4764 4763
4765static int update_block_group(struct btrfs_trans_handle *trans, 4764static int update_block_group(struct btrfs_root *root,
4766 struct btrfs_root *root,
4767 u64 bytenr, u64 num_bytes, int alloc) 4765 u64 bytenr, u64 num_bytes, int alloc)
4768{ 4766{
4769 struct btrfs_block_group_cache *cache = NULL; 4767 struct btrfs_block_group_cache *cache = NULL;
@@ -5312,7 +5310,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
5312 } 5310 }
5313 } 5311 }
5314 5312
5315 ret = update_block_group(trans, root, bytenr, num_bytes, 0); 5313 ret = update_block_group(root, bytenr, num_bytes, 0);
5316 if (ret) { 5314 if (ret) {
5317 btrfs_abort_transaction(trans, extent_root, ret); 5315 btrfs_abort_transaction(trans, extent_root, ret);
5318 goto out; 5316 goto out;
@@ -6134,7 +6132,7 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
6134 btrfs_mark_buffer_dirty(path->nodes[0]); 6132 btrfs_mark_buffer_dirty(path->nodes[0]);
6135 btrfs_free_path(path); 6133 btrfs_free_path(path);
6136 6134
6137 ret = update_block_group(trans, root, ins->objectid, ins->offset, 1); 6135 ret = update_block_group(root, ins->objectid, ins->offset, 1);
6138 if (ret) { /* -ENOENT, logic error */ 6136 if (ret) { /* -ENOENT, logic error */
6139 printk(KERN_ERR "btrfs update block group failed for %llu " 6137 printk(KERN_ERR "btrfs update block group failed for %llu "
6140 "%llu\n", (unsigned long long)ins->objectid, 6138 "%llu\n", (unsigned long long)ins->objectid,
@@ -6198,7 +6196,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
6198 btrfs_mark_buffer_dirty(leaf); 6196 btrfs_mark_buffer_dirty(leaf);
6199 btrfs_free_path(path); 6197 btrfs_free_path(path);
6200 6198
6201 ret = update_block_group(trans, root, ins->objectid, ins->offset, 1); 6199 ret = update_block_group(root, ins->objectid, ins->offset, 1);
6202 if (ret) { /* -ENOENT, logic error */ 6200 if (ret) { /* -ENOENT, logic error */
6203 printk(KERN_ERR "btrfs update block group failed for %llu " 6201 printk(KERN_ERR "btrfs update block group failed for %llu "
6204 "%llu\n", (unsigned long long)ins->objectid, 6202 "%llu\n", (unsigned long long)ins->objectid,