diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-08-23 15:38:12 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-08-23 19:34:30 -0400 |
| commit | b422b19f636329e1a082bcacd3ac6b485d7a5b3e (patch) | |
| tree | ee9979640d17b982ed92581557634a6df57b2fc8 /libbcachefs/journal_io.c | |
| parent | 6f938e0399ce04699682459408b090387c73adb3 (diff) | |
Update bcachefs sources to 22fa8fc32e6a bcachefs: rcu_pending now works in userspace
Diffstat (limited to 'libbcachefs/journal_io.c')
| -rw-r--r-- | libbcachefs/journal_io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c index 7664b68e..32b886fe 100644 --- a/libbcachefs/journal_io.c +++ b/libbcachefs/journal_io.c @@ -1950,7 +1950,8 @@ static int bch2_journal_write_pick_flush(struct journal *j, struct journal_buf * if (error || w->noflush || (!w->must_flush && - (jiffies - j->last_flush_write) < msecs_to_jiffies(c->opts.journal_flush_delay) && + time_before(jiffies, j->last_flush_write + + msecs_to_jiffies(c->opts.journal_flush_delay)) && test_bit(JOURNAL_may_skip_flush, &j->flags))) { w->noflush = true; SET_JSET_NO_FLUSH(w->data, true); |