diff options
| author | Brett Holman <bpholman5@gmail.com> | 2021-05-16 21:53:55 -0600 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-19 15:33:47 -0400 |
| commit | 290378a22279fd47e007e267fc242b676eb3a581 (patch) | |
| tree | b4c66b3d0fdabf78ebff37b80b3a3c900c0fb065 | |
| parent | 3a6925a22b73ce28f3a69e263b575ece829625d9 (diff) | |
bcachefs: made changes to support clang, fixed a couple bugs
fs/bcachefs/bset.c edited prefetch macro to add clang support
fs/bcachefs/btree_iter.c bugfix: initialize iter->real_pos in bch2_btree_iter_init for later use
fs/bcachefs/io.c bugfix: eliminated undefined behavior (negative bitshift)
fs/bcachefs/buckets.c bugfix: invert sign to handle 64bit abs()
| -rw-r--r-- | fs/bcachefs/bset.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 1 | ||||
| -rw-r--r-- | fs/bcachefs/buckets.c | 4 | ||||
| -rw-r--r-- | fs/bcachefs/io.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/fs/bcachefs/bset.c b/fs/bcachefs/bset.c index f92a757f953d..26203a5da504 100644 --- a/fs/bcachefs/bset.c +++ b/fs/bcachefs/bset.c @@ -1193,7 +1193,7 @@ static struct bkey_packed *bset_search_write_set(const struct btree *b, static inline void prefetch_four_cachelines(void *p) { -#ifdef CONFIG_X86_64 +#if (CONFIG_X86_64 && !defined(__clang__)) asm(".intel_syntax noprefix;" "prefetcht0 [%0 - 127 + 64 * 0];" "prefetcht0 [%0 - 127 + 64 * 1];" diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 6bac80aea958..7f86a39b5e60 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1891,6 +1891,7 @@ static inline void bch2_btree_iter_init(struct btree_trans *trans, iter->trans = trans; iter->uptodate = BTREE_ITER_NEED_TRAVERSE; iter->btree_id = btree_id; + iter->real_pos = POS_MIN; iter->level = 0; iter->min_depth = 0; iter->locks_want = 0; diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index e497a938d933..6e988a28a6be 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -1797,7 +1797,9 @@ static int bch2_trans_mark_reflink_p(struct btree_trans *trans, unsigned front_frag, back_frag; s64 ret = 0; - sectors = abs(sectors); + if (sectors < 0) + sectors = -sectors; + BUG_ON(offset + sectors > p.k->size); front_frag = offset; diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 7d0035d853f6..677d354343b7 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -120,7 +120,7 @@ void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw) * the time: */ if (abs((int) (old - io_latency)) < (old >> 1) && - now & ~(~0 << 5)) + now & ~(~0U << 5)) break; new = ewma_add(old, io_latency, 5); |