kevin/linux
1
Fork 0
Code

bcachefs: BCH_DATA_unstriped

Browse Source 
Add a new pseudo data type, to track buckets that are members of a
stripe, but have unstriped data in them.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-11-23 16:34:03 -05:00
parent 55f7962da3
commit 2612e29142
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/bcachefs/alloc_background.h
View File

@ -100,6 +100,11 @@ static inline unsigned bch2_bucket_sectors_fragmented(struct bch_dev *ca,
return d ? max(0, ca->mi.bucket_size - d) : 0;
}
static inline unsigned bch2_bucket_sectors_unstriped(struct bch_alloc_v4 a)
{
return a.data_type == BCH_DATA_stripe ? a.dirty_sectors : 0;
}
static inline enum bch_data_type alloc_data_type(struct bch_alloc_v4 a,
enum bch_data_type data_type)
{

3
fs/bcachefs/bcachefs_format.h
View File

@ -612,7 +612,8 @@ LE64_BITMASK(BCH_KDF_SCRYPT_P, struct bch_sb_field_crypt, kdf_flags, 32, 48);
x(parity, 6) \
x(stripe, 7) \
x(need_gc_gens, 8) \
x(need_discard, 9)
x(need_discard, 9) \
x(unstriped, 10)
enum bch_data_type {
#define x(t, n) BCH_DATA_##t,

14
fs/bcachefs/buckets.c
View File

@ -309,12 +309,20 @@ void bch2_dev_usage_update(struct bch_fs *c, struct bch_dev *ca,
u->d[old->data_type].sectors -= bch2_bucket_sectors_dirty(*old);
u->d[new->data_type].sectors += bch2_bucket_sectors_dirty(*new);
u->d[BCH_DATA_cached].sectors += new->cached_sectors;
u->d[BCH_DATA_cached].sectors -= old->cached_sectors;
u->d[old->data_type].fragmented -= bch2_bucket_sectors_fragmented(ca, *old);
u->d[new->data_type].fragmented += bch2_bucket_sectors_fragmented(ca, *new);
u->d[BCH_DATA_cached].sectors -= old->cached_sectors;
u->d[BCH_DATA_cached].sectors += new->cached_sectors;
unsigned old_unstriped = bch2_bucket_sectors_unstriped(*old);
u->d[BCH_DATA_unstriped].buckets -= old_unstriped != 0;
u->d[BCH_DATA_unstriped].sectors -= old_unstriped;
unsigned new_unstriped = bch2_bucket_sectors_unstriped(*new);
u->d[BCH_DATA_unstriped].buckets += new_unstriped != 0;
u->d[BCH_DATA_unstriped].sectors += new_unstriped;
preempt_enable();
}

2
fs/bcachefs/chardev.c
View File

@ -619,7 +619,7 @@ static long bch2_ioctl_dev_usage(struct bch_fs *c,
arg.bucket_size = ca->mi.bucket_size;
arg.nr_buckets = ca->mi.nbuckets - ca->mi.first_bucket;
for (i = 0; i < BCH_DATA_NR; i++) {
for (i = 0; i < ARRAY_SIZE(arg.d); i++) {
arg.d[i].buckets = src.d[i].buckets;
arg.d[i].sectors = src.d[i].sectors;
arg.d[i].fragmented = src.d[i].fragmented;