bcachefs: bch2_btree_insert() - add btree iter flags
PATCH 1/1 bcachefs: bch2_btree_insert() - add btree iter flags
The commit 65bd44239727 ("bcachefs: bch2_btree_insert_trans() no longer specifies BTREE_ITER_cached") removes BTREE_ITER_cached from bch2_btree_insert_trans, which causes the update_inode function from bcachefs-tools to take a long time (~20s). Add an iter_flags parameter to bch2_btree_insert, so the users can specify iter update trigger flags, such as BTREE_ITER_cached.
--- fs/bcachefs/btree_update.c | 6 ++++-- fs/bcachefs/btree_update.h | 5 +++-- fs/bcachefs/recovery.c | 2 +- fs/bcachefs/subvolume.c | 6 +++--- fs/bcachefs/tests.c | 14 +++++++------- 5 files changed, 18 insertions(+), 15 deletions(-)
fs/bcachefs/btree_update.c +4 -2
@@ -656,14 +656,16 @@ int bch2_btree_insert_trans(struct btree_trans *trans, enum btree_id id,* @disk_res: must be non-NULL whenever inserting or potentially * splitting data extents * @flags: transaction commit flags +* @iter_flags: btree iter update trigger flags * * Returns: 0 on success, error code on failure */ int bch2_btree_insert (struct bch_fs *c,enum btree_id id,struct bkey_i *k, -struct disk_reservation *disk_res,int flags) +struct disk_reservation *disk_res,int flags, +enum btree_iter_update_trigger_flags iter_flags) {return bch2_trans_do (c, disk_res,NULL , flags, -bch2_btree_insert_trans (trans, id, k,0 )); +bch2_btree_insert_trans (trans, id, k, iter_flags)); } int bch2_btree_delete_extent_at(struct btree_trans *trans, struct btree_iter *iter,
fs/bcachefs/btree_update.h +3 -2
@@ -56,8 +56,9 @@ int bch2_btree_insert_nonextent(struct btree_trans *, enum btree_id,int bch2_btree_insert_trans (struct btree_trans *,enum btree_id ,struct bkey_i *,enum btree_iter_update_trigger_flags ); -int bch2_btree_insert (struct bch_fs *,enum btree_id ,struct bkey_i *, -struct disk_reservation *,int flags); +int bch2_btree_insert (struct bch_fs *,enum btree_id ,struct bkey_i *,struct +disk_reservation *,int flags,enum +btree_iter_update_trigger_flags iter_flags);int bch2_btree_delete_range_trans (struct btree_trans *,enum btree_id ,struct bpos ,struct bpos ,unsigned ,u64 *);
fs/bcachefs/recovery.c +1 -1
@@ -1019,7 +1019,7 @@ int bch2_fs_initialize(struct bch_fs *c)bch2_inode_pack (&packed_inode, &root_inode); packed_inode.inode.k.p.snapshot =U32_MAX ; - ret =bch2_btree_insert (c, BTREE_ID_inodes, &packed_inode.inode.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_inodes, &packed_inode.inode.k_i,NULL ,0 ,0 );bch_err_msg (c, ret,"creating root directory" );if (ret) goto err;
fs/bcachefs/subvolume.c +3 -3
@@ -630,9 +630,9 @@ int bch2_initialize_subvolumes(struct bch_fs *c) root_volume.v.snapshot =cpu_to_le32 (U32_MAX ); root_volume.v.inode =cpu_to_le64 (BCACHEFS_ROOT_INO ); - ret =bch2_btree_insert (c, BTREE_ID_snapshot_trees, &root_tree.k_i,NULL ,0 ) ?: -bch2_btree_insert (c, BTREE_ID_snapshots, &root_snapshot.k_i,NULL ,0 ) ?: -bch2_btree_insert (c, BTREE_ID_subvolumes, &root_volume.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_snapshot_trees, &root_tree.k_i,NULL ,0 ,0 ) ?: +bch2_btree_insert (c, BTREE_ID_snapshots, &root_snapshot.k_i,NULL ,0 ,0 ) ?: +bch2_btree_insert (c, BTREE_ID_subvolumes, &root_volume.k_i,NULL ,0 ,0 );bch_err_fn (c, ret);return ret; }
fs/bcachefs/tests.c +7 -7
@@ -121,7 +121,7 @@ static int test_iterate(struct bch_fs *c, u64 nr) ck.k.p.offset = i; ck.k.p.snapshot =U32_MAX ; - ret =bch2_btree_insert (c, BTREE_ID_xattrs, &ck.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_xattrs, &ck.k_i,NULL ,0 ,0 );bch_err_msg (c, ret,"insert error" );if (ret)return ret;
@@ -176,7 +176,7 @@ static int test_iterate_extents(struct bch_fs *c, u64 nr) ck.k.p.snapshot =U32_MAX ; ck.k.size =8 ; - ret =bch2_btree_insert (c, BTREE_ID_extents, &ck.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_extents, &ck.k_i,NULL ,0 ,0 );bch_err_msg (c, ret,"insert error" );if (ret)return ret;
@@ -232,7 +232,7 @@ static int test_iterate_slots(struct bch_fs *c, u64 nr) ck.k.p.offset = i *2 ; ck.k.p.snapshot =U32_MAX ; - ret =bch2_btree_insert (c, BTREE_ID_xattrs, &ck.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_xattrs, &ck.k_i,NULL ,0 ,0 );bch_err_msg (c, ret,"insert error" );if (ret)return ret;
@@ -292,7 +292,7 @@ static int test_iterate_slots_extents(struct bch_fs *c, u64 nr) ck.k.p.snapshot =U32_MAX ; ck.k.size =8 ; - ret =bch2_btree_insert (c, BTREE_ID_extents, &ck.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_extents, &ck.k_i,NULL ,0 ,0 );bch_err_msg (c, ret,"insert error" );if (ret)return ret;
@@ -396,7 +396,7 @@ static int insert_test_extent(struct bch_fs *c, k.k_i.k.size = end - start; k.k_i.k.version.lo = test_version++; - ret =bch2_btree_insert (c, BTREE_ID_extents, &k.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_extents, &k.k_i,NULL ,0 ,0 );bch_err_fn (c, ret);return ret; }
@@ -481,7 +481,7 @@ static int test_snapshot_filter(struct bch_fs *c, u32 snapid_lo, u32 snapid_hi)bkey_cookie_init (&cookie.k_i); cookie.k.p.snapshot = snapid_hi; - ret =bch2_btree_insert (c, BTREE_ID_xattrs, &cookie.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_xattrs, &cookie.k_i,NULL ,0 ,0 );if (ret)return ret;
@@ -506,7 +506,7 @@ static int test_snapshots(struct bch_fs *c, u64 nr)bkey_cookie_init (&cookie.k_i); cookie.k.p.snapshot =U32_MAX ; - ret =bch2_btree_insert (c, BTREE_ID_xattrs, &cookie.k_i,NULL ,0 ); + ret =bch2_btree_insert (c, BTREE_ID_xattrs, &cookie.k_i,NULL ,0 ,0 );if (ret)return ret;
Signature · 1 line
2.34.1
Kent Overstreet
AppliedQuoted 8 lines · Ariel Miculas
The commit
65bd44239727("bcachefs:bch2_btree_insert_trans()no longer specifiesBTREE_ITER_cached") removesBTREE_ITER_cachedfrombch2_btree_insert_trans, which causes theupdate_inodefunction from bcachefs-tools to take a long time (~20s). Add aniter_flagsparameter tobch2_btree_insert, so the users can specify iter update trigger flags, such asBTREE_ITER_cached.Signed-off-by Ariel Miculas <[email protected]>
Applied