diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-04-23 21:56:57 -0800 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-04-23 22:00:36 -0800 |
| commit | c35fbbc025c6099969befb4dfaf065215cf40cf3 (patch) | |
| tree | 3987c3933b0302617425009c7ff23e362268499d /libbcachefs/migrate.c | |
| parent | 1b495cf9e1c75d19cb1bff9b0b13d03c9a62153c (diff) | |
Update bcachefs sources to 2e70771b8d
Diffstat (limited to 'libbcachefs/migrate.c')
| -rw-r--r-- | libbcachefs/migrate.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c index f79b624d..8680b100 100644 --- a/libbcachefs/migrate.c +++ b/libbcachefs/migrate.c @@ -97,7 +97,8 @@ int bch2_move_data_off_device(struct bch_dev *ca) atomic_set(&ctxt.error_count, 0); atomic_set(&ctxt.error_flags, 0); - bch2_btree_iter_init(&iter, c, BTREE_ID_EXTENTS, POS_MIN); + bch2_btree_iter_init(&iter, c, BTREE_ID_EXTENTS, POS_MIN, + BTREE_ITER_PREFETCH); while (!bch2_move_ctxt_wait(&ctxt) && (k = bch2_btree_iter_peek(&iter)).k && @@ -167,7 +168,7 @@ static int bch2_move_btree_off(struct bch_dev *ca, enum btree_id id) closure_init_stack(&cl); - for_each_btree_node(&iter, c, id, POS_MIN, 0, b) { + for_each_btree_node(&iter, c, id, POS_MIN, BTREE_ITER_PREFETCH, b) { struct bkey_s_c_extent e = bkey_i_to_s_c_extent(&b->key); retry: if (!bch2_extent_has_device(e, ca->dev_idx)) @@ -197,7 +198,7 @@ retry: return ret; /* btree IO error */ if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG)) { - for_each_btree_node(&iter, c, id, POS_MIN, 0, b) { + for_each_btree_node(&iter, c, id, POS_MIN, BTREE_ITER_PREFETCH, b) { struct bkey_s_c_extent e = bkey_i_to_s_c_extent(&b->key); BUG_ON(bch2_extent_has_device(e, ca->dev_idx)); @@ -341,7 +342,8 @@ int bch2_flag_data_bad(struct bch_dev *ca) struct bkey_s_c_extent e; struct btree_iter iter; - bch2_btree_iter_init(&iter, ca->fs, BTREE_ID_EXTENTS, POS_MIN); + bch2_btree_iter_init(&iter, ca->fs, BTREE_ID_EXTENTS, + POS_MIN, BTREE_ITER_PREFETCH); while ((k = bch2_btree_iter_peek(&iter)).k && !(ret = btree_iter_err(k))) { |