bcachefs: Kill bch2_alloc_sectors_start()

Only used in one place, just inline it there.

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

3 files changed, 13 insertions, 45 deletions

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index 8fec45d481e7..17e487c0803b 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 12583a7e7aa3..b784a59d67e7 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 d9dbb766d9d1..58291d1ede5b 100644
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -1275,19 +1275,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;