diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-09-12 02:48:07 +0300 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:10:12 +0300 |
commit | aef32bf7cc040fc770199f0c1a0a2cd26f164f45 (patch) | |
tree | 455bc6239b35ea91d844fbed0bf6ce13144ffefe /fs | |
parent | 39791d7de2833ca4dae0061017621ca562748306 (diff) | |
download | linux-aef32bf7cc040fc770199f0c1a0a2cd26f164f45.tar.xz |
bcachefs: __bch2_btree_insert() -> bch2_btree_insert_trans()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/bcachefs/alloc_background.c | 6 | ||||
-rw-r--r-- | fs/bcachefs/btree_update.c | 6 | ||||
-rw-r--r-- | fs/bcachefs/btree_update.h | 2 | ||||
-rw-r--r-- | fs/bcachefs/buckets.c | 2 | ||||
-rw-r--r-- | fs/bcachefs/fsck.c | 2 | ||||
-rw-r--r-- | fs/bcachefs/tests.c | 18 |
6 files changed, 18 insertions, 18 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index fcb3d53bb6f3..5c60f956b598 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -577,7 +577,7 @@ int bch2_bucket_gens_init(struct bch_fs *c) ret = commit_do(&trans, NULL, NULL, BTREE_INSERT_NOFAIL| BTREE_INSERT_LAZY_RW, - __bch2_btree_insert(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); + bch2_btree_insert_trans(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); if (ret) break; have_bucket_gens_key = false; @@ -597,7 +597,7 @@ int bch2_bucket_gens_init(struct bch_fs *c) ret = commit_do(&trans, NULL, NULL, BTREE_INSERT_NOFAIL| BTREE_INSERT_LAZY_RW, - __bch2_btree_insert(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); + bch2_btree_insert_trans(&trans, BTREE_ID_bucket_gens, &g.k_i, 0)); bch2_trans_exit(&trans); @@ -1911,7 +1911,7 @@ static int bch2_dev_freespace_init(struct bch_fs *c, struct bch_dev *ca, freespace->k.p = k.k->p; freespace->k.size = k.k->size; - ret = __bch2_btree_insert(&trans, BTREE_ID_freespace, freespace, 0) ?: + ret = bch2_btree_insert_trans(&trans, BTREE_ID_freespace, freespace, 0) ?: bch2_trans_commit(&trans, NULL, NULL, BTREE_INSERT_LAZY_RW| BTREE_INSERT_NOFAIL); diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c index 7368e1e00f53..3debb29a27f1 100644 --- a/fs/bcachefs/btree_update.c +++ b/fs/bcachefs/btree_update.c @@ -648,8 +648,8 @@ int bch2_btree_insert_nonextent(struct btree_trans *trans, return ret; } -int __bch2_btree_insert(struct btree_trans *trans, enum btree_id id, - struct bkey_i *k, enum btree_update_flags flags) +int bch2_btree_insert_trans(struct btree_trans *trans, enum btree_id id, + struct bkey_i *k, enum btree_update_flags flags) { struct btree_iter iter; int ret; @@ -676,7 +676,7 @@ int bch2_btree_insert(struct bch_fs *c, enum btree_id id, u64 *journal_seq, int flags) { return bch2_trans_do(c, disk_res, journal_seq, flags, - __bch2_btree_insert(&trans, id, k, 0)); + bch2_btree_insert_trans(&trans, id, k, 0)); } int bch2_btree_delete_extent_at(struct btree_trans *trans, struct btree_iter *iter, diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h index 901c42b57c35..78a92a1cfb47 100644 --- a/fs/bcachefs/btree_update.h +++ b/fs/bcachefs/btree_update.h @@ -62,7 +62,7 @@ int bch2_btree_delete_at_buffered(struct btree_trans *, enum btree_id, struct bp int bch2_btree_insert_nonextent(struct btree_trans *, enum btree_id, struct bkey_i *, enum btree_update_flags); -int __bch2_btree_insert(struct btree_trans *, enum btree_id, struct bkey_i *, +int bch2_btree_insert_trans(struct btree_trans *, enum btree_id, struct bkey_i *, enum btree_update_flags); int bch2_btree_insert(struct bch_fs *, enum btree_id, struct bkey_i *, struct disk_reservation *, u64 *, int flags); diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index c02c8c917a29..77ded7c5a22c 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -1201,7 +1201,7 @@ not_found: new->k.p = bkey_start_pos(p.k); new->k.p.offset += *idx - start; bch2_key_resize(&new->k, next_idx - *idx); - ret = __bch2_btree_insert(trans, BTREE_ID_extents, &new->k_i, + ret = bch2_btree_insert_trans(trans, BTREE_ID_extents, &new->k_i, BTREE_TRIGGER_NORUN); } diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c index 26e0a1ced68a..e8cb4448bf2d 100644 --- a/fs/bcachefs/fsck.c +++ b/fs/bcachefs/fsck.c @@ -1914,7 +1914,7 @@ static int check_root_trans(struct btree_trans *trans) ret = commit_do(trans, NULL, NULL, BTREE_INSERT_NOFAIL| BTREE_INSERT_LAZY_RW, - __bch2_btree_insert(trans, BTREE_ID_subvolumes, + bch2_btree_insert_trans(trans, BTREE_ID_subvolumes, &root_subvol.k_i, 0)); if (ret) { bch_err_msg(c, ret, "writing root subvol"); diff --git a/fs/bcachefs/tests.c b/fs/bcachefs/tests.c index 72389c7376d6..0187c81e32ad 100644 --- a/fs/bcachefs/tests.c +++ b/fs/bcachefs/tests.c @@ -622,7 +622,7 @@ static int rand_insert(struct bch_fs *c, u64 nr) k.k.p.snapshot = U32_MAX; ret = commit_do(&trans, NULL, NULL, 0, - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k.k_i, 0)); + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k.k_i, 0)); if (ret) break; } @@ -649,14 +649,14 @@ static int rand_insert_multi(struct bch_fs *c, u64 nr) } ret = commit_do(&trans, NULL, NULL, 0, - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[0].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[1].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[2].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[3].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[4].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[5].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[6].k_i, 0) ?: - __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[7].k_i, 0)); + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[0].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[1].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[2].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[3].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[4].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[5].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[6].k_i, 0) ?: + bch2_btree_insert_trans(&trans, BTREE_ID_xattrs, &k[7].k_i, 0)); if (ret) break; } |