btrfs-progs: Remove unused parameter trans
authorGu Jinxiang <gujx@cn.fujitsu.com>
Tue, 31 Oct 2017 09:23:03 +0000 (17:23 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 8 Jan 2018 18:24:47 +0000 (19:24 +0100)
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>
cmds-check.c
ctree.h
extent-tree.c

index 7fc30da..ce8fd6e 100644 (file)
@@ -2631,8 +2631,7 @@ static int repair_tree_block_ref(struct btrfs_trans_handle *trans,
                }
                btrfs_mark_buffer_dirty(eb);
                printf("Added an extent item [%llu %u]\n", bytenr, node_size);
-               btrfs_update_block_group(trans, extent_root, bytenr, node_size,
-                                        1, 0);
+               btrfs_update_block_group(extent_root, bytenr, node_size, 1, 0);
 
                nrefs->refs[level] = 0;
                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) ?
                                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);
                        if (ret)
                                break;
@@ -9740,7 +9739,7 @@ static int record_extent(struct btrfs_trans_handle *trans,
                }
 
                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);
                if (ret)
                        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_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);
                btrfs_release_path(&path);
        }
diff --git a/ctree.h b/ctree.h
index ef422ea..7db0cd9 100644 (file)
--- a/ctree.h
+++ b/ctree.h
@@ -2536,8 +2536,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
                           u64 size);
 int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
                            struct btrfs_fs_info *fs_info);
-int btrfs_update_block_group(struct btrfs_trans_handle *trans,
-                            struct btrfs_root *root, u64 bytenr, u64 num,
+int btrfs_update_block_group(struct btrfs_root *root, u64 bytenr, u64 num,
                             int alloc, int mark_free);
 int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root, u64 objectid,
index 055582c..edf659d 100644 (file)
@@ -1921,8 +1921,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
        return 0;
 }
 
-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,
                              int mark_free)
 {
@@ -2387,7 +2386,7 @@ static int __free_extent(struct btrfs_trans_handle *trans,
                        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:
        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_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);
        return ret;
 }
@@ -3474,12 +3473,11 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
        return 0;
 }
 
-int btrfs_update_block_group(struct btrfs_trans_handle *trans,
-                            struct btrfs_root *root,
+int btrfs_update_block_group(struct btrfs_root *root,
                             u64 bytenr, u64 num_bytes, int alloc,
                             int mark_free)
 {
-       return update_block_group(trans, root, bytenr, num_bytes,
+       return update_block_group(root, bytenr, num_bytes,
                                  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);
                if (key.type == BTRFS_EXTENT_ITEM_KEY) {
                        bytes_used += key.offset;
-                       ret = btrfs_update_block_group(trans, root,
+                       ret = btrfs_update_block_group(root,
                                  key.objectid, key.offset, 1, 0);
                        BUG_ON(ret);
                } else if (key.type == BTRFS_METADATA_ITEM_KEY) {
                        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);
                        if (ret)
                                goto out;
@@ -4058,7 +4056,7 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans,
                                               BTRFS_EXTENT_FLAG_DATA);
                        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);
                        if (ret)
                                goto fail;