diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-16 02:15:07 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-24 19:24:30 -0400 |
| commit | fc0862035f8ccea40b4fbd7487cb8504a3a44b78 (patch) | |
| tree | f3e069e7312d1a52c065a3f9bc1c038d6b99e2cb | |
| parent | 5b6b14c70250aeb989bbc45316a6f954ba698c00 (diff) | |
XXX copygc, rebalance disabled for now
| -rw-r--r-- | fs/bcachefs/migrate.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/move.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/movinggc.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/rebalance.c | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 1403616b814d..ac22e7321f92 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -48,7 +48,8 @@ static int __bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); iter = bch2_trans_get_iter(&trans, btree_id, POS_MIN, - BTREE_ITER_PREFETCH); + BTREE_ITER_PREFETCH| + BTREE_ITER_ALL_SNAPSHOTS); while ((k = bch2_btree_iter_peek(iter)).k && !(ret = bkey_err(k))) { diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index d6d5cbef6952..a9cd8a5f742e 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -694,6 +694,8 @@ int bch2_move_data(struct bch_fs *c, enum btree_id id; int ret; + return 0; + closure_init_stack(&ctxt.cl); INIT_LIST_HEAD(&ctxt.reads); init_waitqueue_head(&ctxt.wait); diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c index 03668e481f7a..88c6f3e49d66 100644 --- a/fs/bcachefs/movinggc.c +++ b/fs/bcachefs/movinggc.c @@ -340,6 +340,9 @@ int bch2_copygc_start(struct bch_fs *c) { struct task_struct *t; + /* disabled for now: */ + return 0; + if (c->copygc_thread) return 0; diff --git a/fs/bcachefs/rebalance.c b/fs/bcachefs/rebalance.c index a0dbf41d1d37..f455dcd863a5 100644 --- a/fs/bcachefs/rebalance.c +++ b/fs/bcachefs/rebalance.c @@ -312,6 +312,9 @@ int bch2_rebalance_start(struct bch_fs *c) { struct task_struct *p; + /* disabled for now: */ + return 0; + if (c->rebalance.thread) return 0; |