marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Remove unused parameter trans 

Some parameter of trans is not used indeed.
Let's remove them.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Gu Jinxiang 2017-10-31 17:23:03 +08:00 committed by David Sterba
parent b114f7b537
commit 50d4ab19e4
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmds-check.c
View File

@ -2631,8 +2631,7 @@ static int repair_tree_block_ref(struct btrfs_trans_handle *trans,
} }
btrfs_mark_buffer_dirty(eb); btrfs_mark_buffer_dirty(eb);
printf("Added an extent item [%llu %u]\n", bytenr, node_size); printf("Added an extent item [%llu %u]\n", bytenr, node_size);
btrfs_update_block_group(trans, extent_root, bytenr, node_size, btrfs_update_block_group(extent_root, bytenr, node_size, 1, 0);
1, 0);
nrefs->refs[level] = 0; nrefs->refs[level] = 0;
nrefs->full_backref[level] = nrefs->full_backref[level] =
@ -9661,7 +9660,7 @@ static int delete_extent_records(struct btrfs_trans_handle *trans,
u64 bytes = (found_key.type == BTRFS_EXTENT_ITEM_KEY) ? u64 bytes = (found_key.type == BTRFS_EXTENT_ITEM_KEY) ?
found_key.offset : root->fs_info->nodesize; found_key.offset : root->fs_info->nodesize;
ret = btrfs_update_block_group(trans, root, bytenr, ret = btrfs_update_block_group(root, bytenr,
bytes, 0, 0); bytes, 0, 0);
if (ret) if (ret)
break; break;
@ -9740,7 +9739,7 @@ static int record_extent(struct btrfs_trans_handle *trans,
} }
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
ret = btrfs_update_block_group(trans, extent_root, rec->start, ret = btrfs_update_block_group(extent_root, rec->start,
rec->max_size, 1, 0); rec->max_size, 1, 0);
if (ret) if (ret)
goto fail; goto fail;
@ -11973,7 +11972,7 @@ static int repair_extent_data_item(struct btrfs_trans_handle *trans,
btrfs_set_extent_flags(eb, ei, BTRFS_EXTENT_FLAG_DATA); btrfs_set_extent_flags(eb, ei, BTRFS_EXTENT_FLAG_DATA);
btrfs_mark_buffer_dirty(eb); btrfs_mark_buffer_dirty(eb);
ret = btrfs_update_block_group(trans, extent_root, disk_bytenr, ret = btrfs_update_block_group(extent_root, disk_bytenr,
num_bytes, 1, 0); num_bytes, 1, 0);
btrfs_release_path(&path); btrfs_release_path(&path);
} }

3
ctree.h
View File

@ -2536,8 +2536,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
u64 size); u64 size);
int btrfs_make_block_groups(struct btrfs_trans_handle *trans, int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info); struct btrfs_fs_info *fs_info);
int btrfs_update_block_group(struct btrfs_trans_handle *trans, int btrfs_update_block_group(struct btrfs_root *root, u64 bytenr, u64 num,
struct btrfs_root *root, u64 bytenr, u64 num,
int alloc, int mark_free); int alloc, int mark_free);
int btrfs_record_file_extent(struct btrfs_trans_handle *trans, int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 objectid, struct btrfs_root *root, u64 objectid,

18
extent-tree.c
View File

@ -1921,8 +1921,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
return 0; return 0;
} }
static int update_block_group(struct btrfs_trans_handle *trans, static int update_block_group(struct btrfs_root *root,
struct btrfs_root *root,
u64 bytenr, u64 num_bytes, int alloc, u64 bytenr, u64 num_bytes, int alloc,
int mark_free) int mark_free)
{ {
@ -2387,7 +2386,7 @@ static int __free_extent(struct btrfs_trans_handle *trans,
BUG_ON(ret); BUG_ON(ret);
} }
update_block_group(trans, root, bytenr, num_bytes, 0, mark_free); update_block_group(root, bytenr, num_bytes, 0, mark_free);
} }
fail: fail:
btrfs_free_path(path); btrfs_free_path(path);
@ -2747,7 +2746,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
btrfs_free_path(path); btrfs_free_path(path);
ret = update_block_group(trans, root, ins->objectid, fs_info->nodesize, ret = update_block_group(root, ins->objectid, fs_info->nodesize,
1, 0); 1, 0);
return ret; return ret;
} }
@ -3474,12 +3473,11 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
return 0; return 0;
} }
int btrfs_update_block_group(struct btrfs_trans_handle *trans, int btrfs_update_block_group(struct btrfs_root *root,
struct btrfs_root *root,
u64 bytenr, u64 num_bytes, int alloc, u64 bytenr, u64 num_bytes, int alloc,
int mark_free) int mark_free)
{ {
return update_block_group(trans, root, bytenr, num_bytes, return update_block_group(root, bytenr, num_bytes,
alloc, mark_free); alloc, mark_free);
} }
@ -3898,12 +3896,12 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
btrfs_item_key_to_cpu(leaf, &key, slot); btrfs_item_key_to_cpu(leaf, &key, slot);
if (key.type == BTRFS_EXTENT_ITEM_KEY) { if (key.type == BTRFS_EXTENT_ITEM_KEY) {
bytes_used += key.offset; bytes_used += key.offset;
ret = btrfs_update_block_group(trans, root, ret = btrfs_update_block_group(root,
key.objectid, key.offset, 1, 0); key.objectid, key.offset, 1, 0);
BUG_ON(ret); BUG_ON(ret);
} else if (key.type == BTRFS_METADATA_ITEM_KEY) { } else if (key.type == BTRFS_METADATA_ITEM_KEY) {
bytes_used += fs_info->nodesize; bytes_used += fs_info->nodesize;
ret = btrfs_update_block_group(trans, root, ret = btrfs_update_block_group(root,
key.objectid, fs_info->nodesize, 1, 0); key.objectid, fs_info->nodesize, 1, 0);
if (ret) if (ret)
goto out; goto out;
@ -4058,7 +4056,7 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans,
BTRFS_EXTENT_FLAG_DATA); BTRFS_EXTENT_FLAG_DATA);
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
ret = btrfs_update_block_group(trans, root, disk_bytenr, ret = btrfs_update_block_group(root, disk_bytenr,
num_bytes, 1, 0); num_bytes, 1, 0);
if (ret) if (ret)
goto fail; goto fail;