bcachefs: remove dead bch2_evacuate_bucket()

Signed-off-by: Daniel Hill <daniel@gluo.nz>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index bc545613f793a109d669ed99443d30881bed08be..638603d774b53fabf3db16e53e8a45840d21f1fe 100644 (file)
--- 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 531965674a31cb562ea5f7476caeecac6a8d12e1..6a38fed857385b3201bd826157fa6efe6fde38c5 100644 (file)
--- 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 7cffcf6cfa64a9f3edc574d75078b61dacdd74d1..dcb163a68e47bc69ee75eab9b0999fdf9faaae1a 100644 (file)
--- 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;