tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

bcachefs: remove dead bch2_evacuate_bucket()

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

authored by

Daniel Hill and committed by
Kent Overstreet 74529338 62286a08

+3 -27
+1 -19
fs/bcachefs/move.c
··· 636 636 return ret; 637 637 } 638 638 639 - int __bch2_evacuate_bucket(struct moving_context *ctxt, 639 + int bch2_evacuate_bucket(struct moving_context *ctxt, 640 640 struct move_bucket_in_flight *bucket_in_flight, 641 641 struct bpos bucket, int gen, 642 642 struct data_update_opts _data_opts) ··· 793 793 trace_evacuate_bucket(c, &bucket, dirty_sectors, bucket_size, fragmentation, ret); 794 794 err: 795 795 bch2_bkey_buf_exit(&sk, c); 796 - return ret; 797 - } 798 - 799 - int bch2_evacuate_bucket(struct bch_fs *c, 800 - struct bpos bucket, int gen, 801 - struct data_update_opts data_opts, 802 - struct bch_ratelimit *rate, 803 - struct bch_move_stats *stats, 804 - struct write_point_specifier wp, 805 - bool wait_on_copygc) 806 - { 807 - struct moving_context ctxt; 808 - int ret; 809 - 810 - bch2_moving_ctxt_init(&ctxt, c, rate, stats, wp, wait_on_copygc); 811 - ret = __bch2_evacuate_bucket(&ctxt, NULL, bucket, gen, data_opts); 812 - bch2_moving_ctxt_exit(&ctxt); 813 - 814 796 return ret; 815 797 } 816 798
+1 -7
fs/bcachefs/move.h
··· 135 135 bool, 136 136 move_pred_fn, void *); 137 137 138 - int __bch2_evacuate_bucket(struct moving_context *, 138 + int bch2_evacuate_bucket(struct moving_context *, 139 139 struct move_bucket_in_flight *, 140 140 struct bpos, int, 141 141 struct data_update_opts); 142 - int bch2_evacuate_bucket(struct bch_fs *, struct bpos, int, 143 - struct data_update_opts, 144 - struct bch_ratelimit *, 145 - struct bch_move_stats *, 146 - struct write_point_specifier, 147 - bool); 148 142 int bch2_data_job(struct bch_fs *, 149 143 struct bch_move_stats *, 150 144 struct bch_ioctl_data);
+1 -1
fs/bcachefs/movinggc.c
··· 224 224 break; 225 225 } 226 226 227 - ret = __bch2_evacuate_bucket(ctxt, f, f->bucket.k.bucket, 227 + ret = bch2_evacuate_bucket(ctxt, f, f->bucket.k.bucket, 228 228 f->bucket.k.gen, data_opts); 229 229 if (ret) 230 230 goto err;