kevin/linux
1
Fork 0
Code

bcachefs: fix prototype to bch2_alloc_sectors_start_trans()

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-09-01 17:06:28 -04:00
parent da2d20c98d
commit 2e95497e81
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/bcachefs/alloc_foreground.c
View File

@ -748,7 +748,6 @@ static int add_new_bucket(struct bch_fs *c,
unsigned nr_replicas, unsigned nr_replicas,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool *have_cache,
unsigned flags,
struct open_bucket *ob) struct open_bucket *ob)
{ {
unsigned durability = ob_dev(c, ob)->mi.durability; unsigned durability = ob_dev(c, ob)->mi.durability;
@ -775,7 +774,7 @@ int bch2_bucket_alloc_set_trans(struct btree_trans *trans,
unsigned nr_replicas, unsigned nr_replicas,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool *have_cache,
unsigned flags, enum bch_write_flags flags,
enum bch_data_type data_type, enum bch_data_type data_type,
enum bch_watermark watermark, enum bch_watermark watermark,
struct closure *cl) struct closure *cl)
@ -815,7 +814,7 @@ int bch2_bucket_alloc_set_trans(struct btree_trans *trans,
if (add_new_bucket(c, ptrs, devs_may_alloc, if (add_new_bucket(c, ptrs, devs_may_alloc,
nr_replicas, nr_effective, nr_replicas, nr_effective,
have_cache, flags, ob)) { have_cache, ob)) {
ret = 0; ret = 0;
break; break;
} }
@ -841,7 +840,7 @@ static int bucket_alloc_from_stripe(struct btree_trans *trans,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool *have_cache,
enum bch_watermark watermark, enum bch_watermark watermark,
unsigned flags, enum bch_write_flags flags,
struct closure *cl) struct closure *cl)
{ {
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
@ -883,7 +882,7 @@ got_bucket:
ret = add_new_bucket(c, ptrs, devs_may_alloc, ret = add_new_bucket(c, ptrs, devs_may_alloc,
nr_replicas, nr_effective, nr_replicas, nr_effective,
have_cache, flags, ob); have_cache, ob);
out_put_head: out_put_head:
bch2_ec_stripe_head_put(c, h); bch2_ec_stripe_head_put(c, h);
return ret; return ret;
@ -922,7 +921,7 @@ static int bucket_alloc_set_writepoint(struct bch_fs *c,
unsigned nr_replicas, unsigned nr_replicas,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool *have_cache,
bool ec, unsigned flags) bool ec)
{ {
struct open_buckets ptrs_skip = { .nr = 0 }; struct open_buckets ptrs_skip = { .nr = 0 };
struct open_bucket *ob; struct open_bucket *ob;
@ -934,7 +933,7 @@ static int bucket_alloc_set_writepoint(struct bch_fs *c,
have_cache, ec, ob)) have_cache, ec, ob))
ret = add_new_bucket(c, ptrs, devs_may_alloc, ret = add_new_bucket(c, ptrs, devs_may_alloc,
nr_replicas, nr_effective, nr_replicas, nr_effective,
have_cache, flags, ob); have_cache, ob);
else else
ob_push(c, &ptrs_skip, ob); ob_push(c, &ptrs_skip, ob);
} }
@ -950,8 +949,7 @@ static int bucket_alloc_set_partial(struct bch_fs *c,
unsigned nr_replicas, unsigned nr_replicas,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool ec, bool *have_cache, bool ec,
enum bch_watermark watermark, enum bch_watermark watermark)
unsigned flags)
{ {
int i, ret = 0; int i, ret = 0;
@ -983,7 +981,7 @@ static int bucket_alloc_set_partial(struct bch_fs *c,
ret = add_new_bucket(c, ptrs, devs_may_alloc, ret = add_new_bucket(c, ptrs, devs_may_alloc,
nr_replicas, nr_effective, nr_replicas, nr_effective,
have_cache, flags, ob); have_cache, ob);
if (ret) if (ret)
break; break;
} }
@ -1003,7 +1001,7 @@ static int __open_bucket_add_buckets(struct btree_trans *trans,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool *have_cache,
enum bch_watermark watermark, enum bch_watermark watermark,
unsigned flags, enum bch_write_flags flags,
struct closure *_cl) struct closure *_cl)
{ {
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
@ -1024,13 +1022,13 @@ static int __open_bucket_add_buckets(struct btree_trans *trans,
ret = bucket_alloc_set_writepoint(c, ptrs, wp, &devs, ret = bucket_alloc_set_writepoint(c, ptrs, wp, &devs,
nr_replicas, nr_effective, nr_replicas, nr_effective,
have_cache, erasure_code, flags); have_cache, erasure_code);
if (ret) if (ret)
return ret; return ret;
ret = bucket_alloc_set_partial(c, ptrs, wp, &devs, ret = bucket_alloc_set_partial(c, ptrs, wp, &devs,
nr_replicas, nr_effective, nr_replicas, nr_effective,
have_cache, erasure_code, watermark, flags); have_cache, erasure_code, watermark);
if (ret) if (ret)
return ret; return ret;
@ -1071,7 +1069,7 @@ static int open_bucket_add_buckets(struct btree_trans *trans,
unsigned *nr_effective, unsigned *nr_effective,
bool *have_cache, bool *have_cache,
enum bch_watermark watermark, enum bch_watermark watermark,
unsigned flags, enum bch_write_flags flags,
struct closure *cl) struct closure *cl)
{ {
int ret; int ret;
@ -1373,7 +1371,7 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *trans,
unsigned nr_replicas, unsigned nr_replicas,
unsigned nr_replicas_required, unsigned nr_replicas_required,
enum bch_watermark watermark, enum bch_watermark watermark,
unsigned flags, enum bch_write_flags flags,
struct closure *cl, struct closure *cl,
struct write_point **wp_ret) struct write_point **wp_ret)
{ {

5
fs/bcachefs/alloc_foreground.h
View File

@ -155,9 +155,10 @@ static inline bool bch2_bucket_is_open_safe(struct bch_fs *c, unsigned dev, u64
return ret; return ret;
} }
enum bch_write_flags;
int bch2_bucket_alloc_set_trans(struct btree_trans *, struct open_buckets *, int bch2_bucket_alloc_set_trans(struct btree_trans *, struct open_buckets *,
struct dev_stripe_state *, struct bch_devs_mask *, struct dev_stripe_state *, struct bch_devs_mask *,
unsigned, unsigned *, bool *, unsigned, unsigned, unsigned *, bool *, enum bch_write_flags,
enum bch_data_type, enum bch_watermark, enum bch_data_type, enum bch_watermark,
struct closure *); struct closure *);
@ -167,7 +168,7 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *,
struct bch_devs_list *, struct bch_devs_list *,
unsigned, unsigned, unsigned, unsigned,
enum bch_watermark, enum bch_watermark,
unsigned, enum bch_write_flags,
struct closure *, struct closure *,
struct write_point **); struct write_point **);

1
fs/bcachefs/btree_update_interior.c
View File

@ -16,6 +16,7 @@
#include "clock.h" #include "clock.h"
#include "error.h" #include "error.h"
#include "extents.h" #include "extents.h"
#include "io_write.h"
#include "journal.h" #include "journal.h"
#include "journal_reclaim.h" #include "journal_reclaim.h"
#include "keylist.h" #include "keylist.h"

1
fs/bcachefs/ec.c
View File

@ -18,6 +18,7 @@
#include "ec.h" #include "ec.h"
#include "error.h" #include "error.h"
#include "io_read.h" #include "io_read.h"
#include "io_write.h"
#include "keylist.h" #include "keylist.h"
#include "recovery.h" #include "recovery.h"
#include "replicas.h" #include "replicas.h"