mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 20:02:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: alloc_request.ptrs2

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2025-03-31 17:57:06 -04:00
parent e038213658
commit 95f2315af7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/bcachefs/alloc_foreground.c
View File

@@ -825,18 +825,19 @@ static bool want_bucket(struct bch_fs *c,
static int bucket_alloc_set_writepoint(struct bch_fs *c,
struct alloc_request *req)
{
struct open_buckets ptrs_skip = { .nr = 0 };
struct open_bucket *ob;
unsigned i;
int ret = 0;
req->ptrs2.nr = 0;
open_bucket_for_each(c, &req->wp->ptrs, ob, i) {
if (!ret && want_bucket(c, req, ob))
ret = add_new_bucket(c, req, ob);
else
ob_push(c, &ptrs_skip, ob);
ob_push(c, &req->ptrs2, ob);
}
req->wp->ptrs = ptrs_skip;
req->wp->ptrs = req->ptrs2;
return ret;
}
@@ -1209,11 +1210,12 @@ static noinline void
deallocate_extra_replicas(struct bch_fs *c,
struct alloc_request *req)
{
struct open_buckets ptrs2 = { 0 };
struct open_bucket *ob;
unsigned extra_replicas = req->nr_effective - req->nr_replicas;
unsigned i;
req->ptrs2.nr = 0;
open_bucket_for_each(c, &req->ptrs, ob, i) {
unsigned d = ob_dev(c, ob)->mi.durability;
@@ -1221,11 +1223,11 @@ deallocate_extra_replicas(struct bch_fs *c,
extra_replicas -= d;
ob_push(c, &req->wp->ptrs, ob);
} else {
ob_push(c, &ptrs2, ob);
ob_push(c, &req->ptrs2, ob);
}
}
req->ptrs = ptrs2;
req->ptrs = req->ptrs2;
}
/*

1
fs/bcachefs/alloc_foreground.h
View File

@@ -36,6 +36,7 @@ struct alloc_request {
/* These fields are used primarily by open_bucket_add_buckets */
struct open_buckets ptrs;
struct open_buckets ptrs2;
unsigned nr_effective; /* sum of @ptrs durability */
bool have_cache; /* have we allocated from a 0 durability dev */
struct bch_devs_mask devs_may_alloc;