diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-29 13:24:18 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:00 -0400 |
| commit | 174f930b8e1cad3915819a46bb20da214f68f2b5 (patch) | |
| tree | 413eb321e97d3184f68716c8df8a4eef9c1e5b44 /fs/bcachefs/inode.c | |
| parent | ab158fce47220df20f0fe2360767227328f6765b (diff) | |
| download | linux-174f930b8e1cad3915819a46bb20da214f68f2b5.tar.gz linux-174f930b8e1cad3915819a46bb20da214f68f2b5.tar.bz2 linux-174f930b8e1cad3915819a46bb20da214f68f2b5.zip | |
bcachefs: bkey_ops.min_val_size
This adds a new field to bkey_ops for the minimum size of the value,
which standardizes that check and also enforces the new rule (previously
done somewhat ad-hoc) that we can extend value types by adding new
fields on to the end.
To make that work we do _not_ initialize min_val_size with sizeof,
instead we initialize it to the size of the first version of those
values.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/inode.c')
| -rw-r--r-- | fs/bcachefs/inode.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index 7ccbc00b7156..107210dd9c9a 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -437,12 +437,6 @@ int bch2_inode_invalid(const struct bch_fs *c, struct bkey_s_c k, { struct bkey_s_c_inode inode = bkey_s_c_to_inode(k); - if (bkey_val_bytes(k.k) < sizeof(*inode.v)) { - prt_printf(err, "incorrect value size (%zu < %zu)", - bkey_val_bytes(k.k), sizeof(*inode.v)); - return -BCH_ERR_invalid_bkey; - } - if (INODE_STR_HASH(inode.v) >= BCH_STR_HASH_NR) { prt_printf(err, "invalid str hash type (%llu >= %u)", INODE_STR_HASH(inode.v), BCH_STR_HASH_NR); @@ -457,12 +451,6 @@ int bch2_inode_v2_invalid(const struct bch_fs *c, struct bkey_s_c k, { struct bkey_s_c_inode_v2 inode = bkey_s_c_to_inode_v2(k); - if (bkey_val_bytes(k.k) < sizeof(*inode.v)) { - prt_printf(err, "incorrect value size (%zu < %zu)", - bkey_val_bytes(k.k), sizeof(*inode.v)); - return -BCH_ERR_invalid_bkey; - } - if (INODEv2_STR_HASH(inode.v) >= BCH_STR_HASH_NR) { prt_printf(err, "invalid str hash type (%llu >= %u)", INODEv2_STR_HASH(inode.v), BCH_STR_HASH_NR); @@ -477,12 +465,6 @@ int bch2_inode_v3_invalid(const struct bch_fs *c, struct bkey_s_c k, { struct bkey_s_c_inode_v3 inode = bkey_s_c_to_inode_v3(k); - if (bkey_val_bytes(k.k) < sizeof(*inode.v)) { - prt_printf(err, "incorrect value size (%zu < %zu)", - bkey_val_bytes(k.k), sizeof(*inode.v)); - return -BCH_ERR_invalid_bkey; - } - if (INODEv3_FIELDS_START(inode.v) < INODEv3_FIELDS_START_INITIAL || INODEv3_FIELDS_START(inode.v) > bkey_val_u64s(inode.k)) { prt_printf(err, "invalid fields_start (got %llu, min %u max %zu)", @@ -543,12 +525,6 @@ int bch2_inode_generation_invalid(const struct bch_fs *c, struct bkey_s_c k, return -BCH_ERR_invalid_bkey; } - if (bkey_val_bytes(k.k) != sizeof(struct bch_inode_generation)) { - prt_printf(err, "incorrect value size (%zu != %zu)", - bkey_val_bytes(k.k), sizeof(struct bch_inode_generation)); - return -BCH_ERR_invalid_bkey; - } - return 0; } |