diff options
author | Liu Bo <bo.li.liu@oracle.com> | 2012-12-27 04:01:18 -0500 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-02-20 09:37:11 -0500 |
commit | f6373bf3dc6b78cd2c8cfba0215104003ba4a1d0 (patch) | |
tree | c3339eef10a4bd673d73f84324704e15978ee8cf /fs | |
parent | 17b85495cf87ac9b2d9e0878f62fa9f3ae630a6e (diff) |
Btrfs: kill unused arguments of cache_block_group
Argument 'trans' and 'root' are not used any more.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/extent-tree.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index a4a062a0a79c..a9dc12d5ac1b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -468,8 +468,6 @@ out: | |||
468 | } | 468 | } |
469 | 469 | ||
470 | static int cache_block_group(struct btrfs_block_group_cache *cache, | 470 | static int cache_block_group(struct btrfs_block_group_cache *cache, |
471 | struct btrfs_trans_handle *trans, | ||
472 | struct btrfs_root *root, | ||
473 | int load_cache_only) | 471 | int load_cache_only) |
474 | { | 472 | { |
475 | DEFINE_WAIT(wait); | 473 | DEFINE_WAIT(wait); |
@@ -4802,7 +4800,7 @@ static int update_block_group(struct btrfs_trans_handle *trans, | |||
4802 | * space back to the block group, otherwise we will leak space. | 4800 | * space back to the block group, otherwise we will leak space. |
4803 | */ | 4801 | */ |
4804 | if (!alloc && cache->cached == BTRFS_CACHE_NO) | 4802 | if (!alloc && cache->cached == BTRFS_CACHE_NO) |
4805 | cache_block_group(cache, trans, NULL, 1); | 4803 | cache_block_group(cache, 1); |
4806 | 4804 | ||
4807 | byte_in_group = bytenr - cache->key.objectid; | 4805 | byte_in_group = bytenr - cache->key.objectid; |
4808 | WARN_ON(byte_in_group > cache->key.offset); | 4806 | WARN_ON(byte_in_group > cache->key.offset); |
@@ -4917,7 +4915,7 @@ int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans, | |||
4917 | * to one because the slow code to read in the free extents does check | 4915 | * to one because the slow code to read in the free extents does check |
4918 | * the pinned extents. | 4916 | * the pinned extents. |
4919 | */ | 4917 | */ |
4920 | cache_block_group(cache, trans, root, 1); | 4918 | cache_block_group(cache, 1); |
4921 | 4919 | ||
4922 | pin_down_extent(root, cache, bytenr, num_bytes, 0); | 4920 | pin_down_extent(root, cache, bytenr, num_bytes, 0); |
4923 | 4921 | ||
@@ -5707,8 +5705,7 @@ have_block_group: | |||
5707 | cached = block_group_cache_done(block_group); | 5705 | cached = block_group_cache_done(block_group); |
5708 | if (unlikely(!cached)) { | 5706 | if (unlikely(!cached)) { |
5709 | found_uncached_bg = true; | 5707 | found_uncached_bg = true; |
5710 | ret = cache_block_group(block_group, trans, | 5708 | ret = cache_block_group(block_group, 0); |
5711 | orig_root, 0); | ||
5712 | BUG_ON(ret < 0); | 5709 | BUG_ON(ret < 0); |
5713 | ret = 0; | 5710 | ret = 0; |
5714 | } | 5711 | } |
@@ -6244,7 +6241,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans, | |||
6244 | u64 num_bytes = ins->offset; | 6241 | u64 num_bytes = ins->offset; |
6245 | 6242 | ||
6246 | block_group = btrfs_lookup_block_group(root->fs_info, ins->objectid); | 6243 | block_group = btrfs_lookup_block_group(root->fs_info, ins->objectid); |
6247 | cache_block_group(block_group, trans, NULL, 0); | 6244 | cache_block_group(block_group, 0); |
6248 | caching_ctl = get_caching_control(block_group); | 6245 | caching_ctl = get_caching_control(block_group); |
6249 | 6246 | ||
6250 | if (!caching_ctl) { | 6247 | if (!caching_ctl) { |
@@ -8187,7 +8184,7 @@ int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range) | |||
8187 | 8184 | ||
8188 | if (end - start >= range->minlen) { | 8185 | if (end - start >= range->minlen) { |
8189 | if (!block_group_cache_done(cache)) { | 8186 | if (!block_group_cache_done(cache)) { |
8190 | ret = cache_block_group(cache, NULL, root, 0); | 8187 | ret = cache_block_group(cache, 0); |
8191 | if (!ret) | 8188 | if (!ret) |
8192 | wait_block_group_cache_done(cache); | 8189 | wait_block_group_cache_done(cache); |
8193 | } | 8190 | } |