diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-12-28 20:20:17 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-12-28 20:31:39 -0500 |
| commit | f0d907189f1545333efe9b101fc4ce4c07421c8a (patch) | |
| tree | 1aa658bcc2a7ffa9de96c430627d627deb0e0f82 /libbcachefs.c | |
| parent | ff2b85e039b2dc164477c1ac57844a6f456526aa (diff) | |
Update bcachefs sources to 86a99a7b7f bcachefs: Convert some enums to x-macros
Diffstat (limited to 'libbcachefs.c')
| -rw-r--r-- | libbcachefs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libbcachefs.c b/libbcachefs.c index 8f656a27..3cf7827e 100644 --- a/libbcachefs.c +++ b/libbcachefs.c @@ -241,8 +241,6 @@ struct bch_sb *bch2_format(struct bch_opt_strs fs_opt_strs, sb.sb->time_base_lo = cpu_to_le64(now.tv_sec * NSEC_PER_SEC + now.tv_nsec); sb.sb->time_precision = cpu_to_le32(1); - sb.sb->features[0] |= 1ULL << BCH_FEATURE_NEW_SIPHASH; - /* Member info: */ mi = bch2_sb_resize_members(&sb, (sizeof(*mi) + sizeof(struct bch_member) * @@ -756,17 +754,17 @@ void bch2_sb_print(struct bch_sb *sb, bool print_layout, BCH_SB_DATA_REPLICAS_WANT(sb), BCH_SB_META_CSUM_TYPE(sb) < BCH_CSUM_OPT_NR - ? bch2_csum_types[BCH_SB_META_CSUM_TYPE(sb)] + ? bch2_csum_opts[BCH_SB_META_CSUM_TYPE(sb)] : "unknown", BCH_SB_META_CSUM_TYPE(sb), BCH_SB_DATA_CSUM_TYPE(sb) < BCH_CSUM_OPT_NR - ? bch2_csum_types[BCH_SB_DATA_CSUM_TYPE(sb)] + ? bch2_csum_opts[BCH_SB_DATA_CSUM_TYPE(sb)] : "unknown", BCH_SB_DATA_CSUM_TYPE(sb), BCH_SB_COMPRESSION_TYPE(sb) < BCH_COMPRESSION_OPT_NR - ? bch2_compression_types[BCH_SB_COMPRESSION_TYPE(sb)] + ? bch2_compression_opts[BCH_SB_COMPRESSION_TYPE(sb)] : "unknown", BCH_SB_COMPRESSION_TYPE(sb), |