Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bcachefs: bch_acct_snapshot

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-02-12 02:17:02 -05:00
parent 72c2778780
commit 6675c37662
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/bcachefs/buckets.c
View File

@ -778,6 +778,16 @@ static int __trigger_extent(struct btree_trans *trans,
return ret; return ret;
} }
if (acc_replicas_key.replicas.nr_devs && !level && k.k->p.snapshot) {
struct disk_accounting_pos acc_snapshot_key = {
.type = BCH_DISK_ACCOUNTING_snapshot,
.snapshot.id = k.k->p.snapshot,
};
ret = bch2_disk_accounting_mod(trans, &acc_snapshot_key, &replicas_sectors, 1, gc);
if (ret)
return ret;
}
if (acct_compression_key.compression.type) { if (acct_compression_key.compression.type) {
if (flags & BTREE_TRIGGER_overwrite) if (flags & BTREE_TRIGGER_overwrite)
bch2_u64s_neg(compression_acct, ARRAY_SIZE(compression_acct)); bch2_u64s_neg(compression_acct, ARRAY_SIZE(compression_acct));

3
fs/bcachefs/disk_accounting.c
View File

@ -146,6 +146,9 @@ void bch2_accounting_key_to_text(struct printbuf *out, struct disk_accounting_po
case BCH_DISK_ACCOUNTING_compression: case BCH_DISK_ACCOUNTING_compression:
bch2_prt_compression_type(out, k->compression.type); bch2_prt_compression_type(out, k->compression.type);
break; break;
case BCH_DISK_ACCOUNTING_snapshot:
prt_printf(out, "id=%u", k->snapshot.id);
break;
} }
} }

8
fs/bcachefs/disk_accounting_format.h
View File

@ -100,7 +100,8 @@ static inline bool data_type_is_hidden(enum bch_data_type type)
x(persistent_reserved, 1) \ x(persistent_reserved, 1) \
x(replicas, 2) \ x(replicas, 2) \
x(dev_data_type, 3) \ x(dev_data_type, 3) \
x(compression, 4) x(compression, 4) \
x(snapshot, 5)
enum disk_accounting_type { enum disk_accounting_type {
#define x(f, nr) BCH_DISK_ACCOUNTING_##f = nr, #define x(f, nr) BCH_DISK_ACCOUNTING_##f = nr,
@ -129,6 +130,10 @@ struct bch_acct_compression {
__u8 type; __u8 type;
}; };
struct bch_acct_snapshot {
__u32 id;
};
struct disk_accounting_pos { struct disk_accounting_pos {
union { union {
struct { struct {
@ -140,6 +145,7 @@ struct disk_accounting_pos {
struct bch_dev_data_type dev_data_type; struct bch_dev_data_type dev_data_type;
struct bch_dev_stripe_buckets dev_stripe_buckets; struct bch_dev_stripe_buckets dev_stripe_buckets;
struct bch_acct_compression compression; struct bch_acct_compression compression;
struct bch_acct_snapshot snapshot;
}; };
}; };
struct bpos _pad; struct bpos _pad;