summaryrefslogtreecommitdiff
path: root/libbcachefs/migrate.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-04-17 17:01:40 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2019-04-17 19:00:38 -0400
commitb485aae1bac95e3b5be235116e2bc43da85906c5 (patch)
tree844734692f40b3e18bf35fbc9e3c3eb4a5610729 /libbcachefs/migrate.c
parentf652fdc9622ee513469f046bceea81ada7fa5b02 (diff)
Update bcachefs sources to 6f603b8d79 bcachefs: some improvements to startup messages and options
Diffstat (limited to 'libbcachefs/migrate.c')
-rw-r--r--libbcachefs/migrate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c
index 88761d34..822b3fce 100644
--- a/libbcachefs/migrate.c
+++ b/libbcachefs/migrate.c
@@ -42,6 +42,7 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
int ret = 0;
bch2_trans_init(&trans, c);
+ bch2_trans_preload_iters(&trans);
iter = bch2_trans_get_iter(&trans, BTREE_ID_EXTENTS,
POS_MIN, BTREE_ITER_PREFETCH);
@@ -95,6 +96,8 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
break;
}
+ BUG_ON(ret == -EINTR);
+
bch2_trans_exit(&trans);
bch2_replicas_gc_end(c, ret);