public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-27 01:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcachefs: Fix allocator + journal interaction

Browse source 
The allocator needs to wait until the last update touching a bucket has
been commited before writing to it again. However, the code was checking
against the last dirty journal sequence number, not the last flushed
journal sequence number.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2021-12-26 21:41:09 -05:00 • committed by Kent Overstreet
parent a786087744
commit 36f035e908
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/bcachefs/alloc_background.c
View file

@ -594,7 +594,7 @@ static void find_reclaimable_buckets_lru(struct bch_fs *c, struct bch_dev *ca)
buckets = bucket_array(ca); buckets = bucket_array(ca);
ca->alloc_heap.used = 0; ca->alloc_heap.used = 0;
now = atomic64_read(&c->io_clock[READ].now); now = atomic64_read(&c->io_clock[READ].now);
last_seq_ondisk = c->journal.last_seq_ondisk; last_seq_ondisk = c->journal.flushed_seq_ondisk;
/* /*
* Find buckets with lowest read priority, by building a maxheap sorted * Find buckets with lowest read priority, by building a maxheap sorted

2
fs/bcachefs/buckets.c
View file

@ -50,7 +50,7 @@ static inline void fs_usage_data_type_to_base(struct bch_fs_usage *fs_usage,
void bch2_bucket_seq_cleanup(struct bch_fs *c) void bch2_bucket_seq_cleanup(struct bch_fs *c)
{ {
u64 journal_seq = atomic64_read(&c->journal.seq); u64 journal_seq = atomic64_read(&c->journal.seq);
u16 last_seq_ondisk = c->journal.last_seq_ondisk; u16 last_seq_ondisk = c->journal.flushed_seq_ondisk;
struct bch_dev *ca; struct bch_dev *ca;
struct bucket_array *buckets; struct bucket_array *buckets;
struct bucket *g; struct bucket *g;