2525#include <linux/random.h>
2626
2727static int bch2_btree_insert_node (struct btree_update * , struct btree_trans * ,
28- btree_path_idx_t , struct btree * ,
29- struct keylist * , unsigned );
28+ btree_path_idx_t , struct btree * , struct keylist * );
3029static void bch2_btree_update_add_new_node (struct btree_update * , struct btree * );
3130
3231static btree_path_idx_t get_unlocked_mut_path (struct btree_trans * trans ,
@@ -1473,7 +1472,7 @@ static void btree_split_insert_keys(struct btree_update *as,
14731472
14741473static int btree_split (struct btree_update * as , struct btree_trans * trans ,
14751474 btree_path_idx_t path , struct btree * b ,
1476- struct keylist * keys , unsigned flags )
1475+ struct keylist * keys )
14771476{
14781477 struct bch_fs * c = as -> c ;
14791478 struct btree * parent = btree_node_parent (trans -> paths + path , b );
@@ -1574,7 +1573,7 @@ static int btree_split(struct btree_update *as, struct btree_trans *trans,
15741573
15751574 if (parent ) {
15761575 /* Split a non root node */
1577- ret = bch2_btree_insert_node (as , trans , path , parent , & as -> parent_keys , flags );
1576+ ret = bch2_btree_insert_node (as , trans , path , parent , & as -> parent_keys );
15781577 if (ret )
15791578 goto err ;
15801579 } else if (n3 ) {
@@ -1669,7 +1668,6 @@ bch2_btree_insert_keys_interior(struct btree_update *as,
16691668 * @path_idx: path that points to current node
16701669 * @b: node to insert keys into
16711670 * @keys: list of keys to insert
1672- * @flags: transaction commit flags
16731671 *
16741672 * Returns: 0 on success, typically transaction restart error on failure
16751673 *
@@ -1679,7 +1677,7 @@ bch2_btree_insert_keys_interior(struct btree_update *as,
16791677 */
16801678static int bch2_btree_insert_node (struct btree_update * as , struct btree_trans * trans ,
16811679 btree_path_idx_t path_idx , struct btree * b ,
1682- struct keylist * keys , unsigned flags )
1680+ struct keylist * keys )
16831681{
16841682 struct bch_fs * c = as -> c ;
16851683 struct btree_path * path = trans -> paths + path_idx ;
@@ -1735,7 +1733,7 @@ static int bch2_btree_insert_node(struct btree_update *as, struct btree_trans *t
17351733 return btree_trans_restart (trans , BCH_ERR_transaction_restart_split_race );
17361734 }
17371735
1738- return btree_split (as , trans , path_idx , b , keys , flags );
1736+ return btree_split (as , trans , path_idx , b , keys );
17391737}
17401738
17411739int bch2_btree_split_leaf (struct btree_trans * trans ,
@@ -1754,7 +1752,7 @@ int bch2_btree_split_leaf(struct btree_trans *trans,
17541752 if (IS_ERR (as ))
17551753 return PTR_ERR (as );
17561754
1757- ret = btree_split (as , trans , path , b , NULL , flags );
1755+ ret = btree_split (as , trans , path , b , NULL );
17581756 if (ret ) {
17591757 bch2_btree_update_free (as , trans );
17601758 return ret ;
@@ -1964,7 +1962,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans,
19641962
19651963 bch2_trans_verify_paths (trans );
19661964
1967- ret = bch2_btree_insert_node (as , trans , path , parent , & as -> parent_keys , flags );
1965+ ret = bch2_btree_insert_node (as , trans , path , parent , & as -> parent_keys );
19681966 if (ret )
19691967 goto err_free_update ;
19701968
@@ -2035,8 +2033,7 @@ int bch2_btree_node_rewrite(struct btree_trans *trans,
20352033
20362034 if (parent ) {
20372035 bch2_keylist_add (& as -> parent_keys , & n -> key );
2038- ret = bch2_btree_insert_node (as , trans , iter -> path ,
2039- parent , & as -> parent_keys , flags );
2036+ ret = bch2_btree_insert_node (as , trans , iter -> path , parent , & as -> parent_keys );
20402037 if (ret )
20412038 goto err ;
20422039 } else {
0 commit comments