summaryrefslogtreecommitdiff
path: root/fs/bcachefs
diff options
context:
space:
mode:
authorDaniel Hill <daniel@gluo.nz>2023-11-26 10:26:07 +0300
committerKent Overstreet <kent.overstreet@linux.dev>2024-01-01 19:47:39 +0300
commit74529338805d514a07ba4e6feb25997c4be3bddd (patch)
tree1c0f9fe01f3e3d7b2035011e3c08e4a9c9b3d9dc /fs/bcachefs
parent62286a08c3f352d2c19c08da3b2a5b9d23f34d61 (diff)
downloadlinux-74529338805d514a07ba4e6feb25997c4be3bddd.tar.xz
bcachefs: remove dead bch2_evacuate_bucket()
Signed-off-by: Daniel Hill <daniel@gluo.nz> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs')
-rw-r--r--fs/bcachefs/move.c20
-rw-r--r--fs/bcachefs/move.h8
-rw-r--r--fs/bcachefs/movinggc.c2
3 files changed, 3 insertions, 27 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index bc545613f793..638603d774b5 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -636,7 +636,7 @@ int bch2_move_data(struct bch_fs *c,
return ret;
}
-int __bch2_evacuate_bucket(struct moving_context *ctxt,
+int bch2_evacuate_bucket(struct moving_context *ctxt,
struct move_bucket_in_flight *bucket_in_flight,
struct bpos bucket, int gen,
struct data_update_opts _data_opts)
@@ -796,24 +796,6 @@ err:
return ret;
}
-int bch2_evacuate_bucket(struct bch_fs *c,
- struct bpos bucket, int gen,
- struct data_update_opts data_opts,
- struct bch_ratelimit *rate,
- struct bch_move_stats *stats,
- struct write_point_specifier wp,
- bool wait_on_copygc)
-{
- struct moving_context ctxt;
- int ret;
-
- bch2_moving_ctxt_init(&ctxt, c, rate, stats, wp, wait_on_copygc);
- ret = __bch2_evacuate_bucket(&ctxt, NULL, bucket, gen, data_opts);
- bch2_moving_ctxt_exit(&ctxt);
-
- return ret;
-}
-
typedef bool (*move_btree_pred)(struct bch_fs *, void *,
struct btree *, struct bch_io_opts *,
struct data_update_opts *);
diff --git a/fs/bcachefs/move.h b/fs/bcachefs/move.h
index 531965674a31..6a38fed85738 100644
--- a/fs/bcachefs/move.h
+++ b/fs/bcachefs/move.h
@@ -135,16 +135,10 @@ int bch2_move_data(struct bch_fs *,
bool,
move_pred_fn, void *);
-int __bch2_evacuate_bucket(struct moving_context *,
+int bch2_evacuate_bucket(struct moving_context *,
struct move_bucket_in_flight *,
struct bpos, int,
struct data_update_opts);
-int bch2_evacuate_bucket(struct bch_fs *, struct bpos, int,
- struct data_update_opts,
- struct bch_ratelimit *,
- struct bch_move_stats *,
- struct write_point_specifier,
- bool);
int bch2_data_job(struct bch_fs *,
struct bch_move_stats *,
struct bch_ioctl_data);
diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c
index 7cffcf6cfa64..dcb163a68e47 100644
--- a/fs/bcachefs/movinggc.c
+++ b/fs/bcachefs/movinggc.c
@@ -224,7 +224,7 @@ static int bch2_copygc(struct moving_context *ctxt,
break;
}
- ret = __bch2_evacuate_bucket(ctxt, f, f->bucket.k.bucket,
+ ret = bch2_evacuate_bucket(ctxt, f, f->bucket.k.bucket,
f->bucket.k.gen, data_opts);
if (ret)
goto err;