{
struct btree_path *path = trans->paths + path_idx, *dup;
- EBUG_ON(path->idx != path_idx);
-
if (!__btree_path_put(path, intent))
return;
static void bch2_path_put_nokeep(struct btree_trans *trans, btree_path_idx_t path,
bool intent)
{
- EBUG_ON(trans->paths[path].idx != path);
-
if (!__btree_path_put(trans->paths + path, intent))
return;
__set_bit(idx, trans->paths_allocated);
struct btree_path *path = &trans->paths[idx];
- path->idx = idx;
path->ref = 0;
path->intent_ref = 0;
path->nodes_locked = 0;
prt_printf(out, "%i %s\n", task ? task->pid : 0, trans->fn);
- trans_for_each_path_safe(trans, path, idx) {
+ trans_for_each_path(trans, path, idx) {
if (!path->nodes_locked)
continue;
}
static inline struct btree_path *
-__trans_next_path_safe(struct btree_trans *trans, unsigned *idx)
+__trans_next_path(struct btree_trans *trans, unsigned *idx)
{
*idx = find_next_bit(trans->paths_allocated, BTREE_ITER_MAX, *idx);
- if (*idx == BTREE_ITER_MAX)
- return NULL;
- EBUG_ON(*idx > BTREE_ITER_MAX);
- return &trans->paths[*idx];
+ return *idx < BTREE_ITER_MAX ? &trans->paths[*idx] : NULL;
}
/*
* This version is intended to be safe for use on a btree_trans that is owned by
* another thread, for bch2_btree_trans_to_text();
*/
-#define trans_for_each_path_safe_from(_trans, _path, _idx, _start) \
+#define trans_for_each_path_from(_trans, _path, _idx, _start) \
for (_idx = _start; \
- (_path = __trans_next_path_safe((_trans), &_idx)); \
+ (_path = __trans_next_path((_trans), &_idx)); \
_idx++)
-#define trans_for_each_path_safe(_trans, _path, _idx) \
- trans_for_each_path_safe_from(_trans, _path, _idx, 1)
-
-static inline struct btree_path *
-__trans_next_path(struct btree_trans *trans, unsigned *idx)
-{
- struct btree_path *path = __trans_next_path_safe(trans, idx);
- EBUG_ON(path && path->idx != *idx);
- return path;
-}
-
-#define trans_for_each_path(_trans, _path, _iter) \
- for (_iter = 1; \
- (_path = __trans_next_path((_trans), &_iter)); \
- _iter++)
+#define trans_for_each_path(_trans, _path, _idx) \
+ trans_for_each_path_from(_trans, _path, _idx, 1)
static inline struct btree_path *next_btree_path(struct btree_trans *trans, struct btree_path *path)
{