diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-13 19:34:02 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-14 12:28:45 -0400 |
| commit | 2ff2b9ebbace8073e7c6a9290dc2da7705beda96 (patch) | |
| tree | ecfb028d139d38f4c7aae7fc6385e8de275196de | |
| parent | dd5318f29a188db5585057de3e7141d3e2b4a627 (diff) | |
bcachefs: Fix bkey format calculation
For extents, we increase the number of bits of the size field to allow
extents to get bigger due to merging - but this code didn't check for
overflow.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/bkey.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/bkey.c b/fs/bcachefs/bkey.c index d6960e259c80..0a5bfe6e9a2d 100644 --- a/fs/bcachefs/bkey.c +++ b/fs/bcachefs/bkey.c @@ -591,8 +591,10 @@ struct bkey_format bch2_bkey_format_done(struct bkey_format_state *s) /* allow for extent merging: */ if (ret.bits_per_field[BKEY_FIELD_SIZE]) { - ret.bits_per_field[BKEY_FIELD_SIZE] += 4; - bits += 4; + unsigned b = min(4U, 32U - ret.bits_per_field[BKEY_FIELD_SIZE]); + + ret.bits_per_field[BKEY_FIELD_SIZE] += b; + bits += b; } ret.key_u64s = DIV_ROUND_UP(bits, 64); |