diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-11-10 22:18:52 -0900 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-11-10 22:18:52 -0900 |
commit | e9afb70d261e420e540b0c79a718e76b03b1182b (patch) | |
tree | b3f0203e13db746e7e2bce02f5a98200bb70983d /libbcachefs/bkey.c | |
parent | ea57dd8d48ecd10414fbdfaf4f0338d3a017d2cb (diff) |
Update bcachefs sources to 6a361fb68c bcachefs: Rework btree read error handling
Diffstat (limited to 'libbcachefs/bkey.c')
-rw-r--r-- | libbcachefs/bkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbcachefs/bkey.c b/libbcachefs/bkey.c index 19bf1b8f..d33bc4e1 100644 --- a/libbcachefs/bkey.c +++ b/libbcachefs/bkey.c @@ -626,25 +626,25 @@ const char *bch2_bkey_format_validate(struct bkey_format *f) unsigned i, bits = KEY_PACKED_BITS_START; if (f->nr_fields != BKEY_NR_FIELDS) - return "invalid format: incorrect number of fields"; + return "incorrect number of fields"; for (i = 0; i < f->nr_fields; i++) { u64 field_offset = le64_to_cpu(f->field_offset[i]); if (f->bits_per_field[i] > 64) - return "invalid format: field too large"; + return "field too large"; if (field_offset && (f->bits_per_field[i] == 64 || (field_offset + ((1ULL << f->bits_per_field[i]) - 1) < field_offset))) - return "invalid format: offset + bits overflow"; + return "offset + bits overflow"; bits += f->bits_per_field[i]; } if (f->key_u64s != DIV_ROUND_UP(bits, 64)) - return "invalid format: incorrect key_u64s"; + return "incorrect key_u64s"; return NULL; } |