Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bcachefs: Kill unnecessary wakeups in journal reclaim

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-01-31 11:06:59 -05:00
parent 0be5b38bce
commit 4f70176cb9
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/bcachefs/journal_reclaim.c
View File

@ -394,8 +394,6 @@ void bch2_journal_pin_copy(struct journal *j,
struct journal_entry_pin *src, struct journal_entry_pin *src,
journal_pin_flush_fn flush_fn) journal_pin_flush_fn flush_fn)
{ {
bool reclaim;
spin_lock(&j->lock); spin_lock(&j->lock);
u64 seq = READ_ONCE(src->seq); u64 seq = READ_ONCE(src->seq);
@ -411,44 +409,44 @@ void bch2_journal_pin_copy(struct journal *j,
return; return;
} }
reclaim = __journal_pin_drop(j, dst); bool reclaim = __journal_pin_drop(j, dst);
bch2_journal_pin_set_locked(j, seq, dst, flush_fn, journal_pin_type(flush_fn)); bch2_journal_pin_set_locked(j, seq, dst, flush_fn, journal_pin_type(flush_fn));
if (reclaim) if (reclaim)
bch2_journal_reclaim_fast(j); bch2_journal_reclaim_fast(j);
spin_unlock(&j->lock);
/* /*
* If the journal is currently full, we might want to call flush_fn * If the journal is currently full, we might want to call flush_fn
* immediately: * immediately:
*/ */
journal_wake(j); if (seq == journal_last_seq(j))
journal_wake(j);
spin_unlock(&j->lock);
} }
void bch2_journal_pin_set(struct journal *j, u64 seq, void bch2_journal_pin_set(struct journal *j, u64 seq,
struct journal_entry_pin *pin, struct journal_entry_pin *pin,
journal_pin_flush_fn flush_fn) journal_pin_flush_fn flush_fn)
{ {
bool reclaim;
spin_lock(&j->lock); spin_lock(&j->lock);
BUG_ON(seq < journal_last_seq(j)); BUG_ON(seq < journal_last_seq(j));
reclaim = __journal_pin_drop(j, pin); bool reclaim = __journal_pin_drop(j, pin);
bch2_journal_pin_set_locked(j, seq, pin, flush_fn, journal_pin_type(flush_fn)); bch2_journal_pin_set_locked(j, seq, pin, flush_fn, journal_pin_type(flush_fn));
if (reclaim) if (reclaim)
bch2_journal_reclaim_fast(j); bch2_journal_reclaim_fast(j);
spin_unlock(&j->lock);
/* /*
* If the journal is currently full, we might want to call flush_fn * If the journal is currently full, we might want to call flush_fn
* immediately: * immediately:
*/ */
journal_wake(j); if (seq == journal_last_seq(j))
journal_wake(j);
spin_unlock(&j->lock);
} }
/** /**