bcachefs: Kill bch2_alloc_sectors_start()

Only used in one place, just inline it there.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index ccc6be5a002f74ae59f61059fd4ecb034b36861a..9a4a62211755eadfc77c8635c3530719a0fe2672 100644 (file)
--- 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 12583a7e7aa3af219ab1d47871c92005f6d1b807..b784a59d67e7088a8421dd1486bdacb98b4c212e 100644 (file)
--- 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 4818c78e521379adfcf52b739bcfc5bffa11e417..e754f57c134282601d465377f59d154261125ce8 100644 (file)
--- 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;