diff options
author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2013-04-16 01:18:02 -0400 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-06 15:54:52 -0400 |
commit | d6a0a12684523d635e0530a9d70a1eba4b8c4fb9 (patch) | |
tree | 30844c4afe1c60d958f386ca96eab9fc7cd0c863 /fs/btrfs | |
parent | b4fcd6be6bbd702ae1a6545c9b413681850a9814 (diff) |
Btrfs: remove unused argument of fixup_low_keys()
Argument 'trans' is not used in fixup_low_keys(). So, remove it.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/ctree.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index c3c3d37f9c58..71442d0d3140 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -2905,8 +2905,7 @@ again: | |||
2905 | * higher levels | 2905 | * higher levels |
2906 | * | 2906 | * |
2907 | */ | 2907 | */ |
2908 | static void fixup_low_keys(struct btrfs_trans_handle *trans, | 2908 | static void fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path, |
2909 | struct btrfs_root *root, struct btrfs_path *path, | ||
2910 | struct btrfs_disk_key *key, int level) | 2909 | struct btrfs_disk_key *key, int level) |
2911 | { | 2910 | { |
2912 | int i; | 2911 | int i; |
@@ -2954,7 +2953,7 @@ void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans, | |||
2954 | btrfs_set_item_key(eb, &disk_key, slot); | 2953 | btrfs_set_item_key(eb, &disk_key, slot); |
2955 | btrfs_mark_buffer_dirty(eb); | 2954 | btrfs_mark_buffer_dirty(eb); |
2956 | if (slot == 0) | 2955 | if (slot == 0) |
2957 | fixup_low_keys(trans, root, path, &disk_key, 1); | 2956 | fixup_low_keys(root, path, &disk_key, 1); |
2958 | } | 2957 | } |
2959 | 2958 | ||
2960 | /* | 2959 | /* |
@@ -3692,7 +3691,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, | |||
3692 | clean_tree_block(trans, root, right); | 3691 | clean_tree_block(trans, root, right); |
3693 | 3692 | ||
3694 | btrfs_item_key(right, &disk_key, 0); | 3693 | btrfs_item_key(right, &disk_key, 0); |
3695 | fixup_low_keys(trans, root, path, &disk_key, 1); | 3694 | fixup_low_keys(root, path, &disk_key, 1); |
3696 | 3695 | ||
3697 | /* then fixup the leaf pointer in the path */ | 3696 | /* then fixup the leaf pointer in the path */ |
3698 | if (path->slots[0] < push_items) { | 3697 | if (path->slots[0] < push_items) { |
@@ -4052,8 +4051,7 @@ again: | |||
4052 | path->nodes[0] = right; | 4051 | path->nodes[0] = right; |
4053 | path->slots[0] = 0; | 4052 | path->slots[0] = 0; |
4054 | if (path->slots[1] == 0) | 4053 | if (path->slots[1] == 0) |
4055 | fixup_low_keys(trans, root, path, | 4054 | fixup_low_keys(root, path, &disk_key, 1); |
4056 | &disk_key, 1); | ||
4057 | } | 4055 | } |
4058 | btrfs_mark_buffer_dirty(right); | 4056 | btrfs_mark_buffer_dirty(right); |
4059 | return ret; | 4057 | return ret; |
@@ -4372,7 +4370,7 @@ void btrfs_truncate_item(struct btrfs_trans_handle *trans, | |||
4372 | btrfs_set_disk_key_offset(&disk_key, offset + size_diff); | 4370 | btrfs_set_disk_key_offset(&disk_key, offset + size_diff); |
4373 | btrfs_set_item_key(leaf, &disk_key, slot); | 4371 | btrfs_set_item_key(leaf, &disk_key, slot); |
4374 | if (slot == 0) | 4372 | if (slot == 0) |
4375 | fixup_low_keys(trans, root, path, &disk_key, 1); | 4373 | fixup_low_keys(root, path, &disk_key, 1); |
4376 | } | 4374 | } |
4377 | 4375 | ||
4378 | item = btrfs_item_nr(leaf, slot); | 4376 | item = btrfs_item_nr(leaf, slot); |
@@ -4536,7 +4534,7 @@ void setup_items_for_insert(struct btrfs_trans_handle *trans, | |||
4536 | 4534 | ||
4537 | if (slot == 0) { | 4535 | if (slot == 0) { |
4538 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); | 4536 | btrfs_cpu_key_to_disk(&disk_key, cpu_key); |
4539 | fixup_low_keys(trans, root, path, &disk_key, 1); | 4537 | fixup_low_keys(root, path, &disk_key, 1); |
4540 | } | 4538 | } |
4541 | btrfs_unlock_up_safe(path, 1); | 4539 | btrfs_unlock_up_safe(path, 1); |
4542 | btrfs_mark_buffer_dirty(leaf); | 4540 | btrfs_mark_buffer_dirty(leaf); |
@@ -4647,7 +4645,7 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
4647 | struct btrfs_disk_key disk_key; | 4645 | struct btrfs_disk_key disk_key; |
4648 | 4646 | ||
4649 | btrfs_node_key(parent, &disk_key, 0); | 4647 | btrfs_node_key(parent, &disk_key, 0); |
4650 | fixup_low_keys(trans, root, path, &disk_key, level + 1); | 4648 | fixup_low_keys(root, path, &disk_key, level + 1); |
4651 | } | 4649 | } |
4652 | btrfs_mark_buffer_dirty(parent); | 4650 | btrfs_mark_buffer_dirty(parent); |
4653 | } | 4651 | } |
@@ -4749,7 +4747,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
4749 | struct btrfs_disk_key disk_key; | 4747 | struct btrfs_disk_key disk_key; |
4750 | 4748 | ||
4751 | btrfs_item_key(leaf, &disk_key, 0); | 4749 | btrfs_item_key(leaf, &disk_key, 0); |
4752 | fixup_low_keys(trans, root, path, &disk_key, 1); | 4750 | fixup_low_keys(root, path, &disk_key, 1); |
4753 | } | 4751 | } |
4754 | 4752 | ||
4755 | /* delete the leaf if it is mostly empty */ | 4753 | /* delete the leaf if it is mostly empty */ |