iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Kill bch2_alloc_sectors_start()

Browse Source 
Only used in one place, just inline it there.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2022-11-02 15:41:32 -04:00
parent 984dc67e3b
commit 07de1803b8
3 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/bcachefs/alloc_foreground.c
View File

@ -1228,29 +1228,6 @@ err:
return ret; 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_extent_ptr bch2_ob_ptr(struct bch_fs *c, struct open_bucket *ob)
{ {
struct bch_dev *ca = bch_dev_bkey_exists(c, ob->dev); struct bch_dev *ca = bch_dev_bkey_exists(c, ob->dev);

9
fs/bcachefs/alloc_foreground.h
View File

@ -147,15 +147,6 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *,
unsigned, unsigned,
struct closure *, struct closure *,
struct write_point **); 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 *); 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 *, void bch2_alloc_sectors_append_ptrs(struct bch_fs *, struct write_point *,

26
fs/bcachefs/io.c
View File

@ -1274,19 +1274,19 @@ again:
* freeing up space on specific disks, which means that * freeing up space on specific disks, which means that
* allocations for specific disks may hang arbitrarily long: * allocations for specific disks may hang arbitrarily long:
*/ */
ret = bch2_alloc_sectors_start(c, ret = bch2_trans_do(c, NULL, NULL, 0,
op->target, bch2_alloc_sectors_start_trans(&trans,
op->opts.erasure_code && !(op->flags & BCH_WRITE_CACHED), op->target,
op->write_point, op->opts.erasure_code && !(op->flags & BCH_WRITE_CACHED),
&op->devs_have, op->write_point,
op->nr_replicas, &op->devs_have,
op->nr_replicas_required, op->nr_replicas,
op->alloc_reserve, op->nr_replicas_required,
op->flags, op->alloc_reserve,
(op->flags & (BCH_WRITE_ALLOC_NOWAIT| op->flags,
BCH_WRITE_ONLY_SPECIFIED_DEVS)) (op->flags & (BCH_WRITE_ALLOC_NOWAIT|
? NULL : &op->cl, BCH_WRITE_ONLY_SPECIFIED_DEVS))
&wp); ? NULL : &op->cl, &wp));
if (unlikely(ret)) { if (unlikely(ret)) {
if (ret == -EAGAIN) if (ret == -EAGAIN)
break; break;