From 07de1803b888131ef1675b17a0260b50d684175e Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 2 Nov 2022 15:41:32 -0400 Subject: [PATCH] bcachefs: Kill bch2_alloc_sectors_start() Only used in one place, just inline it there. Signed-off-by: Kent Overstreet --- fs/bcachefs/alloc_foreground.c | 23 ----------------------- fs/bcachefs/alloc_foreground.h | 9 --------- fs/bcachefs/io.c | 26 +++++++++++++------------- 3 files changed, 13 insertions(+), 45 deletions(-) diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c index ccc6be5a002f7..9a4a62211755e 100644 --- a/fs/bcachefs/alloc_foreground.c +++ b/fs/bcachefs/alloc_foreground.c @@ -1228,29 +1228,6 @@ err: return ret; } -int bch2_alloc_sectors_start(struct bch_fs *c, - unsigned target, - unsigned erasure_code, - struct write_point_specifier write_point, - struct bch_devs_list *devs_have, - unsigned nr_replicas, - unsigned nr_replicas_required, - enum alloc_reserve reserve, - unsigned flags, - struct closure *cl, - struct write_point **wp_ret) -{ - return bch2_trans_do(c, NULL, NULL, 0, - bch2_alloc_sectors_start_trans(&trans, target, - erasure_code, - write_point, - devs_have, - nr_replicas, - nr_replicas_required, - reserve, - flags, cl, wp_ret)); -} - struct bch_extent_ptr bch2_ob_ptr(struct bch_fs *c, struct open_bucket *ob) { struct bch_dev *ca = bch_dev_bkey_exists(c, ob->dev); diff --git a/fs/bcachefs/alloc_foreground.h b/fs/bcachefs/alloc_foreground.h index 12583a7e7aa3a..b784a59d67e70 100644 --- a/fs/bcachefs/alloc_foreground.h +++ b/fs/bcachefs/alloc_foreground.h @@ -147,15 +147,6 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *, unsigned, struct closure *, struct write_point **); -int bch2_alloc_sectors_start(struct bch_fs *, - unsigned, unsigned, - struct write_point_specifier, - struct bch_devs_list *, - unsigned, unsigned, - enum alloc_reserve, - unsigned, - struct closure *, - struct write_point **); struct bch_extent_ptr bch2_ob_ptr(struct bch_fs *, struct open_bucket *); void bch2_alloc_sectors_append_ptrs(struct bch_fs *, struct write_point *, diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 4818c78e52137..e754f57c13428 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -1274,19 +1274,19 @@ again: * freeing up space on specific disks, which means that * allocations for specific disks may hang arbitrarily long: */ - ret = bch2_alloc_sectors_start(c, - op->target, - op->opts.erasure_code && !(op->flags & BCH_WRITE_CACHED), - op->write_point, - &op->devs_have, - op->nr_replicas, - op->nr_replicas_required, - op->alloc_reserve, - op->flags, - (op->flags & (BCH_WRITE_ALLOC_NOWAIT| - BCH_WRITE_ONLY_SPECIFIED_DEVS)) - ? NULL : &op->cl, - &wp); + ret = bch2_trans_do(c, NULL, NULL, 0, + bch2_alloc_sectors_start_trans(&trans, + op->target, + op->opts.erasure_code && !(op->flags & BCH_WRITE_CACHED), + op->write_point, + &op->devs_have, + op->nr_replicas, + op->nr_replicas_required, + op->alloc_reserve, + op->flags, + (op->flags & (BCH_WRITE_ALLOC_NOWAIT| + BCH_WRITE_ONLY_SPECIFIED_DEVS)) + ? NULL : &op->cl, &wp)); if (unlikely(ret)) { if (ret == -EAGAIN) break; -- 2.30.2