alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to 49c34dadca bcachefs: Switch bch2_btree_delete_range() to bch2_trans_run()

Browse Source
This commit is contained in:
Kent Overstreet 2022-08-11 19:25:47 -04:00
parent ddac1641ee
commit 51ffcc6993
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
90a9c61e2bcf20935aebda1c0c8078ad0fff2475 49c34dadcad9c33b1e8510b5543d60c40fa0bebd

17
libbcachefs/btree_iter.c
View File

@ -1940,7 +1940,6 @@ struct btree_path *bch2_path_get(struct btree_trans *trans,
struct btree_path *path, *path_pos = NULL; struct btree_path *path, *path_pos = NULL;
bool cached = flags & BTREE_ITER_CACHED; bool cached = flags & BTREE_ITER_CACHED;
bool intent = flags & BTREE_ITER_INTENT; bool intent = flags & BTREE_ITER_INTENT;
bool have_dup = false;
int i; int i;
BUG_ON(trans->restarted); BUG_ON(trans->restarted);
@ -1948,24 +1947,14 @@ struct btree_path *bch2_path_get(struct btree_trans *trans,
bch2_trans_verify_locks(trans); bch2_trans_verify_locks(trans);
trans_for_each_path_inorder(trans, path, i) { trans_for_each_path_inorder(trans, path, i) {
int cmp = __btree_path_cmp(path, if (__btree_path_cmp(path,
btree_id, btree_id,
cached, cached,
pos, pos,
level); level) > 0)
if (cmp > 0)
break; break;
path_pos = path; path_pos = path;
if (cmp == 0) {
if (path->ref || path->preserve) {
path->preserve = true;
have_dup = true;
} else {
break;
}
}
} }
if (path_pos && if (path_pos &&
@ -1996,7 +1985,7 @@ struct btree_path *bch2_path_get(struct btree_trans *trans,
btree_trans_verify_sorted(trans); btree_trans_verify_sorted(trans);
} }
if (!(flags & BTREE_ITER_NOPRESERVE) && !have_dup) if (!(flags & BTREE_ITER_NOPRESERVE))
path->preserve = true; path->preserve = true;
if (path->intent_ref) if (path->intent_ref)