diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-10-02 16:40:12 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-10-12 15:11:04 -0400 |
| commit | 00b09c7893c267f649982fef9b7134269f6061ff (patch) | |
| tree | 303d408e2098a9bbbda8c7cf4795b12e1a76acbb | |
| parent | c55bb005a669ba500260b19a9119fb15218ca499 (diff) | |
bcachefs: kill bch_extent_crc_type
| -rw-r--r-- | fs/bcachefs/extents.h | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/fs/bcachefs/extents.h b/fs/bcachefs/extents.h index f0dfb47c4e70..5862084752fd 100644 --- a/fs/bcachefs/extents.h +++ b/fs/bcachefs/extents.h @@ -234,44 +234,6 @@ union bch_extent_crc { /* checksum entries: */ -enum bch_extent_crc_type { - BCH_EXTENT_CRC_NONE, - BCH_EXTENT_CRC32, - BCH_EXTENT_CRC64, - BCH_EXTENT_CRC128, -}; - -static inline enum bch_extent_crc_type -__extent_crc_type(const union bch_extent_crc *crc) -{ - if (!crc) - return BCH_EXTENT_CRC_NONE; - - switch (extent_entry_type(to_entry(crc))) { - case BCH_EXTENT_ENTRY_crc32: - return BCH_EXTENT_CRC32; - case BCH_EXTENT_ENTRY_crc64: - return BCH_EXTENT_CRC64; - case BCH_EXTENT_ENTRY_crc128: - return BCH_EXTENT_CRC128; - default: - BUG(); - } -} - -#define extent_crc_type(_crc) \ -({ \ - BUILD_BUG_ON(!type_is(_crc, struct bch_extent_crc32 *) && \ - !type_is(_crc, struct bch_extent_crc64 *) && \ - !type_is(_crc, struct bch_extent_crc128 *) && \ - !type_is(_crc, union bch_extent_crc *)); \ - \ - type_is(_crc, struct bch_extent_crc32 *) ? BCH_EXTENT_CRC32 \ - : type_is(_crc, struct bch_extent_crc64 *) ? BCH_EXTENT_CRC64 \ - : type_is(_crc, struct bch_extent_crc128 *) ? BCH_EXTENT_CRC128 \ - : __extent_crc_type((union bch_extent_crc *) _crc); \ -}) - static inline struct bch_extent_crc_unpacked bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc) { @@ -283,14 +245,15 @@ bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc) .offset = _crc.offset, \ .live_size = k->size - switch (extent_crc_type(crc)) { - case BCH_EXTENT_CRC_NONE: + if (!crc) return (struct bch_extent_crc_unpacked) { .compressed_size = k->size, .uncompressed_size = k->size, .live_size = k->size, }; - case BCH_EXTENT_CRC32: { + + switch (extent_entry_type(to_entry(crc))) { + case BCH_EXTENT_ENTRY_crc32: { struct bch_extent_crc_unpacked ret = (struct bch_extent_crc_unpacked) { common_fields(crc->crc32), }; @@ -302,7 +265,7 @@ bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc) return ret; } - case BCH_EXTENT_CRC64: { + case BCH_EXTENT_ENTRY_crc64: { struct bch_extent_crc_unpacked ret = (struct bch_extent_crc_unpacked) { common_fields(crc->crc64), .nonce = crc->crc64.nonce, @@ -313,7 +276,7 @@ bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc) return ret; } - case BCH_EXTENT_CRC128: { + case BCH_EXTENT_ENTRY_crc128: { struct bch_extent_crc_unpacked ret = (struct bch_extent_crc_unpacked) { common_fields(crc->crc128), .nonce = crc->crc128.nonce, |