diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-24 15:47:51 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-28 18:12:46 -0400 |
| commit | cf9c9a3adc4e9224f1dfa86d1eb2b5f549f125c1 (patch) | |
| tree | 3afa1d9f261fb3b47a8bfbd2dbbb98687dc8f78d | |
| parent | 9facbb021240c6f57a950eda10ffb760c973daff (diff) | |
bcachefs: Rename some constants to avoid conflicts with bcache
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/bcachefs_format.h | 16 | ||||
| -rw-r--r-- | fs/bcachefs/super-io.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index cb720ee04b86..ad06eefb5b57 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -756,13 +756,13 @@ static size_t find_reclaimable_buckets(struct bch_fs *c, struct bch_dev *ca) ca->inc_gen_needs_gc = 0; switch (ca->mi.replacement) { - case CACHE_REPLACEMENT_LRU: + case BCH2_CACHE_REPLACEMENT_LRU: find_reclaimable_buckets_lru(c, ca); break; - case CACHE_REPLACEMENT_FIFO: + case BCH2_CACHE_REPLACEMENT_FIFO: find_reclaimable_buckets_fifo(c, ca); break; - case CACHE_REPLACEMENT_RANDOM: + case BCH2_CACHE_REPLACEMENT_RANDOM: find_reclaimable_buckets_random(c, ca); break; } diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index f808e63a713d..4f8a675ba729 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -965,10 +965,10 @@ enum bch_member_state { }; enum cache_replacement { - CACHE_REPLACEMENT_LRU = 0, - CACHE_REPLACEMENT_FIFO = 1, - CACHE_REPLACEMENT_RANDOM = 2, - CACHE_REPLACEMENT_NR = 3, + BCH2_CACHE_REPLACEMENT_LRU = 0, + BCH2_CACHE_REPLACEMENT_FIFO = 1, + BCH2_CACHE_REPLACEMENT_RANDOM = 2, + BCH2_CACHE_REPLACEMENT_NR = 3, }; struct bch_sb_field_members { @@ -1442,8 +1442,8 @@ enum bch_compression_opts { #define BCACHEFS_STATFS_MAGIC 0xca451a4e -#define JSET_MAGIC __cpu_to_le64(0x245235c1a3625032ULL) -#define BSET_MAGIC __cpu_to_le64(0x90135c78b99e07f5ULL) +#define BCH2_JSET_MAGIC __cpu_to_le64(0x245235c1a3625032ULL) +#define BCH2_BSET_MAGIC __cpu_to_le64(0x90135c78b99e07f5ULL) static inline __le64 __bch2_sb_magic(struct bch_sb *sb) { @@ -1454,12 +1454,12 @@ static inline __le64 __bch2_sb_magic(struct bch_sb *sb) static inline __u64 __jset_magic(struct bch_sb *sb) { - return __le64_to_cpu(__bch2_sb_magic(sb) ^ JSET_MAGIC); + return __le64_to_cpu(__bch2_sb_magic(sb) ^ BCH2_JSET_MAGIC); } static inline __u64 __bset_magic(struct bch_sb *sb) { - return __le64_to_cpu(__bch2_sb_magic(sb) ^ BSET_MAGIC); + return __le64_to_cpu(__bch2_sb_magic(sb) ^ BCH2_BSET_MAGIC); } /* Journal */ diff --git a/fs/bcachefs/super-io.h b/fs/bcachefs/super-io.h index 7a068158efca..cacc819dc68e 100644 --- a/fs/bcachefs/super-io.h +++ b/fs/bcachefs/super-io.h @@ -52,12 +52,12 @@ static inline __le64 bch2_sb_magic(struct bch_fs *c) static inline __u64 jset_magic(struct bch_fs *c) { - return __le64_to_cpu(bch2_sb_magic(c) ^ JSET_MAGIC); + return __le64_to_cpu(bch2_sb_magic(c) ^ BCH2_JSET_MAGIC); } static inline __u64 bset_magic(struct bch_fs *c) { - return __le64_to_cpu(bch2_sb_magic(c) ^ BSET_MAGIC); + return __le64_to_cpu(bch2_sb_magic(c) ^ BCH2_BSET_MAGIC); } int bch2_sb_to_fs(struct bch_fs *, struct bch_sb *); |