tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

bcachefs: __bch2_btree_insert() -> bch2_btree_insert_trans()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

Kent Overstreet aef32bf7 39791d7d

+18 -18
+3 -3
fs/bcachefs/alloc_background.c
··· 577 577 ret = commit_do(&trans, NULL, NULL, 578 578 BTREE_INSERT_NOFAIL| 579 579 BTREE_INSERT_LAZY_RW, 580 - __bch2_btree_insert(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); 580 + bch2_btree_insert_trans(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); 581 581 if (ret) 582 582 break; 583 583 have_bucket_gens_key = false; ··· 597 597 ret = commit_do(&trans, NULL, NULL, 598 598 BTREE_INSERT_NOFAIL| 599 599 BTREE_INSERT_LAZY_RW, 600 - __bch2_btree_insert(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); 600 + bch2_btree_insert_trans(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); 601 601 602 602 bch2_trans_exit(&trans); 603 603 ··· 1911 1911 freespace->k.p = k.k->p; 1912 1912 freespace->k.size = k.k->size; 1913 1913 1914 - ret = __bch2_btree_insert(&trans, BTREE_ID_freespace, freespace, 0) ?: 1914 + ret = bch2_btree_insert_trans(&trans, BTREE_ID_freespace, freespace, 0) ?: 1915 1915 bch2_trans_commit(&trans, NULL, NULL, 1916 1916 BTREE_INSERT_LAZY_RW| 1917 1917 BTREE_INSERT_NOFAIL);
+3 -3
fs/bcachefs/btree_update.c
··· 648 648 return ret; 649 649 } 650 650 651 - int __bch2_btree_insert(struct btree_trans *trans, enum btree_id id, 652 - struct bkey_i *k, enum btree_update_flags flags) 651 + int bch2_btree_insert_trans(struct btree_trans *trans, enum btree_id id, 652 + struct bkey_i *k, enum btree_update_flags flags) 653 653 { 654 654 struct btree_iter iter; 655 655 int ret; ··· 676 676 u64 *journal_seq, int flags) 677 677 { 678 678 return bch2_trans_do(c, disk_res, journal_seq, flags, 679 - __bch2_btree_insert(&trans, id, k, 0)); 679 + bch2_btree_insert_trans(&trans, id, k, 0)); 680 680 } 681 681 682 682 int bch2_btree_delete_extent_at(struct btree_trans *trans, struct btree_iter *iter,
+1 -1
fs/bcachefs/btree_update.h
··· 62 62 int bch2_btree_insert_nonextent(struct btree_trans *, enum btree_id, 63 63 struct bkey_i *, enum btree_update_flags); 64 64 65 - int __bch2_btree_insert(struct btree_trans *, enum btree_id, struct bkey_i *, 65 + int bch2_btree_insert_trans(struct btree_trans *, enum btree_id, struct bkey_i *, 66 66 enum btree_update_flags); 67 67 int bch2_btree_insert(struct bch_fs *, enum btree_id, struct bkey_i *, 68 68 struct disk_reservation *, u64 *, int flags);
+1 -1
fs/bcachefs/buckets.c
··· 1201 1201 new->k.p = bkey_start_pos(p.k); 1202 1202 new->k.p.offset += *idx - start; 1203 1203 bch2_key_resize(&new->k, next_idx - *idx); 1204 - ret = __bch2_btree_insert(trans, BTREE_ID_extents, &new->k_i, 1204 + ret = bch2_btree_insert_trans(trans, BTREE_ID_extents, &new->k_i, 1205 1205 BTREE_TRIGGER_NORUN); 1206 1206 } 1207 1207
+1 -1
fs/bcachefs/fsck.c
··· 1914 1914 ret = commit_do(trans, NULL, NULL, 1915 1915 BTREE_INSERT_NOFAIL| 1916 1916 BTREE_INSERT_LAZY_RW, 1917 - __bch2_btree_insert(trans, BTREE_ID_subvolumes, 1917 + bch2_btree_insert_trans(trans, BTREE_ID_subvolumes, 1918 1918 &root_subvol.k_i, 0)); 1919 1919 if (ret) { 1920 1920 bch_err_msg(c, ret, "writing root subvol");
+9 -9
fs/bcachefs/tests.c
··· 622 622 k.k.p.snapshot = U32_MAX; 623 623 624 624 ret = commit_do(&trans, NULL, NULL, 0, 625 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k.k_i, 0)); 625 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k.k_i, 0)); 626 626 if (ret) 627 627 break; 628 628 } ··· 649 649 } 650 650 651 651 ret = commit_do(&trans, NULL, NULL, 0, 652 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[0].k_i, 0) ?: 653 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[1].k_i, 0) ?: 654 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[2].k_i, 0) ?: 655 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[3].k_i, 0) ?: 656 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[4].k_i, 0) ?: 657 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[5].k_i, 0) ?: 658 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[6].k_i, 0) ?: 659 - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[7].k_i, 0)); 652 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[0].k_i, 0) ?: 653 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[1].k_i, 0) ?: 654 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[2].k_i, 0) ?: 655 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[3].k_i, 0) ?: 656 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[4].k_i, 0) ?: 657 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[5].k_i, 0) ?: 658 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[6].k_i, 0) ?: 659 + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[7].k_i, 0)); 660 660 if (ret) 661 661 break; 662 662 }