summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/bcachefs/move.c6
-rw-r--r--fs/bcachefs/opts.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index a852e07affdc..08fb8c71893f 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -22,8 +22,6 @@
#include <linux/ioprio.h>
#include <linux/kthread.h>
-#define SECTORS_IN_FLIGHT_PER_DEVICE 2048
-
struct moving_io {
struct list_head list;
struct closure cl;
@@ -693,11 +691,11 @@ static int __bch2_move_data(struct bch_fs *c,
move_ctxt_wait_event(ctxt, &trans,
atomic_read(&ctxt->write_sectors) <
- SECTORS_IN_FLIGHT_PER_DEVICE);
+ c->opts.move_bytes_in_flight >> 9);
move_ctxt_wait_event(ctxt, &trans,
atomic_read(&ctxt->read_sectors) <
- SECTORS_IN_FLIGHT_PER_DEVICE);
+ c->opts.move_bytes_in_flight >> 9);
bch2_trans_begin(&trans);
diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
index dee75d7e6fe8..43b4488b8c6f 100644
--- a/fs/bcachefs/opts.h
+++ b/fs/bcachefs/opts.h
@@ -290,6 +290,11 @@ enum opt_type {
OPT_UINT(0, U32_MAX), \
BCH_SB_JOURNAL_RECLAIM_DELAY, 100, \
NULL, "Delay in milliseconds before automatic journal reclaim")\
+ x(move_bytes_in_flight, u32, \
+ OPT_HUMAN_READABLE|OPT_FS|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_UINT(1024, U32_MAX), \
+ BCH2_NO_SB_OPT, 1U << 20, \
+ NULL, "Amount of IO in flight to keep in flight by the move path")\
x(fsck, u8, \
OPT_FS|OPT_MOUNT, \
OPT_BOOL(), \