aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2012-10-19 08:52:15 -0400
committerJosef Bacik <jbacik@fusionio.com>2012-12-11 13:31:35 -0500
commit32adf0901371c8b9d258dba7811f3067d1d2ea5c (patch)
tree1c78770f75c28f1cc830b1dbdf41a6ecda8114d2
parent0e411ecec60138f22442728f036d38cfea007817 (diff)
Btrfs: cleanup unused arguments
'disk_key' is not used at all. Signed-off-by: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
-rw-r--r--fs/btrfs/ctree.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 615b74968fab..100c274a1cfe 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -775,8 +775,7 @@ tree_mod_log_eb_move(struct btrfs_fs_info *fs_info, struct extent_buffer *dst,
775 775
776static noinline void 776static noinline void
777tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info, 777tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info,
778 struct extent_buffer *eb, 778 struct extent_buffer *eb, int slot, int atomic)
779 struct btrfs_disk_key *disk_key, int slot, int atomic)
780{ 779{
781 int ret; 780 int ret;
782 781
@@ -1835,7 +1834,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
1835 struct btrfs_disk_key right_key; 1834 struct btrfs_disk_key right_key;
1836 btrfs_node_key(right, &right_key, 0); 1835 btrfs_node_key(right, &right_key, 0);
1837 tree_mod_log_set_node_key(root->fs_info, parent, 1836 tree_mod_log_set_node_key(root->fs_info, parent,
1838 &right_key, pslot + 1, 0); 1837 pslot + 1, 0);
1839 btrfs_set_node_key(parent, &right_key, pslot + 1); 1838 btrfs_set_node_key(parent, &right_key, pslot + 1);
1840 btrfs_mark_buffer_dirty(parent); 1839 btrfs_mark_buffer_dirty(parent);
1841 } 1840 }
@@ -1879,7 +1878,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
1879 /* update the parent key to reflect our changes */ 1878 /* update the parent key to reflect our changes */
1880 struct btrfs_disk_key mid_key; 1879 struct btrfs_disk_key mid_key;
1881 btrfs_node_key(mid, &mid_key, 0); 1880 btrfs_node_key(mid, &mid_key, 0);
1882 tree_mod_log_set_node_key(root->fs_info, parent, &mid_key, 1881 tree_mod_log_set_node_key(root->fs_info, parent,
1883 pslot, 0); 1882 pslot, 0);
1884 btrfs_set_node_key(parent, &mid_key, pslot); 1883 btrfs_set_node_key(parent, &mid_key, pslot);
1885 btrfs_mark_buffer_dirty(parent); 1884 btrfs_mark_buffer_dirty(parent);
@@ -1979,7 +1978,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
1979 orig_slot += left_nr; 1978 orig_slot += left_nr;
1980 btrfs_node_key(mid, &disk_key, 0); 1979 btrfs_node_key(mid, &disk_key, 0);
1981 tree_mod_log_set_node_key(root->fs_info, parent, 1980 tree_mod_log_set_node_key(root->fs_info, parent,
1982 &disk_key, pslot, 0); 1981 pslot, 0);
1983 btrfs_set_node_key(parent, &disk_key, pslot); 1982 btrfs_set_node_key(parent, &disk_key, pslot);
1984 btrfs_mark_buffer_dirty(parent); 1983 btrfs_mark_buffer_dirty(parent);
1985 if (btrfs_header_nritems(left) > orig_slot) { 1984 if (btrfs_header_nritems(left) > orig_slot) {
@@ -2032,7 +2031,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
2032 2031
2033 btrfs_node_key(right, &disk_key, 0); 2032 btrfs_node_key(right, &disk_key, 0);
2034 tree_mod_log_set_node_key(root->fs_info, parent, 2033 tree_mod_log_set_node_key(root->fs_info, parent,
2035 &disk_key, pslot + 1, 0); 2034 pslot + 1, 0);
2036 btrfs_set_node_key(parent, &disk_key, pslot + 1); 2035 btrfs_set_node_key(parent, &disk_key, pslot + 1);
2037 btrfs_mark_buffer_dirty(parent); 2036 btrfs_mark_buffer_dirty(parent);
2038 2037
@@ -2916,7 +2915,7 @@ static void fixup_low_keys(struct btrfs_trans_handle *trans,
2916 if (!path->nodes[i]) 2915 if (!path->nodes[i])
2917 break; 2916 break;
2918 t = path->nodes[i]; 2917 t = path->nodes[i];
2919 tree_mod_log_set_node_key(root->fs_info, t, key, tslot, 1); 2918 tree_mod_log_set_node_key(root->fs_info, t, tslot, 1);
2920 btrfs_set_node_key(t, key, tslot); 2919 btrfs_set_node_key(t, key, tslot);
2921 btrfs_mark_buffer_dirty(path->nodes[i]); 2920 btrfs_mark_buffer_dirty(path->nodes[i]);
2922 if (tslot != 0) 2921 if (tslot != 0)