iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: made changes to support clang, fixed a couple bugs

Browse Source 
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()

Signed-off-by: Brett Holman <bpholman5@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Brett Holman 2021-05-16 21:53:55 -06:00 committed by Kent Overstreet
parent 6ebe32b94c
commit 2cd0563461
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/bcachefs/bset.c
View File

@ -1181,7 +1181,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];"

1
fs/bcachefs/btree_iter.c
View File

@ -1898,6 +1898,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;

4
fs/bcachefs/buckets.c
View File

@ -1801,7 +1801,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;

2
fs/bcachefs/io.c
View File

@ -121,7 +121,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);