25
25
#include <linux/random.h>
26
26
27
27
static 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 * );
30
29
static void bch2_btree_update_add_new_node (struct btree_update * , struct btree * );
31
30
32
31
static 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,
1473
1472
1474
1473
static int btree_split (struct btree_update * as , struct btree_trans * trans ,
1475
1474
btree_path_idx_t path , struct btree * b ,
1476
- struct keylist * keys , unsigned flags )
1475
+ struct keylist * keys )
1477
1476
{
1478
1477
struct bch_fs * c = as -> c ;
1479
1478
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,
1574
1573
1575
1574
if (parent ) {
1576
1575
/* 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 );
1578
1577
if (ret )
1579
1578
goto err ;
1580
1579
} else if (n3 ) {
@@ -1669,7 +1668,6 @@ bch2_btree_insert_keys_interior(struct btree_update *as,
1669
1668
* @path_idx: path that points to current node
1670
1669
* @b: node to insert keys into
1671
1670
* @keys: list of keys to insert
1672
- * @flags: transaction commit flags
1673
1671
*
1674
1672
* Returns: 0 on success, typically transaction restart error on failure
1675
1673
*
@@ -1679,7 +1677,7 @@ bch2_btree_insert_keys_interior(struct btree_update *as,
1679
1677
*/
1680
1678
static int bch2_btree_insert_node (struct btree_update * as , struct btree_trans * trans ,
1681
1679
btree_path_idx_t path_idx , struct btree * b ,
1682
- struct keylist * keys , unsigned flags )
1680
+ struct keylist * keys )
1683
1681
{
1684
1682
struct bch_fs * c = as -> c ;
1685
1683
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
1735
1733
return btree_trans_restart (trans , BCH_ERR_transaction_restart_split_race );
1736
1734
}
1737
1735
1738
- return btree_split (as , trans , path_idx , b , keys , flags );
1736
+ return btree_split (as , trans , path_idx , b , keys );
1739
1737
}
1740
1738
1741
1739
int bch2_btree_split_leaf (struct btree_trans * trans ,
@@ -1754,7 +1752,7 @@ int bch2_btree_split_leaf(struct btree_trans *trans,
1754
1752
if (IS_ERR (as ))
1755
1753
return PTR_ERR (as );
1756
1754
1757
- ret = btree_split (as , trans , path , b , NULL , flags );
1755
+ ret = btree_split (as , trans , path , b , NULL );
1758
1756
if (ret ) {
1759
1757
bch2_btree_update_free (as , trans );
1760
1758
return ret ;
@@ -1964,7 +1962,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans,
1964
1962
1965
1963
bch2_trans_verify_paths (trans );
1966
1964
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 );
1968
1966
if (ret )
1969
1967
goto err_free_update ;
1970
1968
@@ -2035,8 +2033,7 @@ int bch2_btree_node_rewrite(struct btree_trans *trans,
2035
2033
2036
2034
if (parent ) {
2037
2035
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 );
2040
2037
if (ret )
2041
2038
goto err ;
2042
2039
} else {
0 commit comments