aboutsummaryrefslogtreecommitdiff
path: root/fs/bcachefs/journal_reclaim.c
diff options
context:
space:
mode:
authorGravatar Kent Overstreet <kent.overstreet@gmail.com> 2022-03-07 01:35:55 -0500
committerGravatar Kent Overstreet <kent.overstreet@linux.dev> 2023-10-22 17:09:48 -0400
commita2b9a5b272f2bbfc3988f4b5c8e92d9951885bcb (patch)
treecc42e131683da099cd4eb3ec6bdc22fa9f10df73 /fs/bcachefs/journal_reclaim.c
parentbcachefs: Fix for long running btree transactions & key cache (diff)
downloadlinux-a2b9a5b272f2bbfc3988f4b5c8e92d9951885bcb.tar.gz
linux-a2b9a5b272f2bbfc3988f4b5c8e92d9951885bcb.tar.bz2
linux-a2b9a5b272f2bbfc3988f4b5c8e92d9951885bcb.zip
bcachefs: Fix bch2_journal_flush_device_pins()
It's now legal for the pin fifo to be empty, which means this code needs to be updated in order to not hit an assert. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/journal_reclaim.c')
-rw-r--r--fs/bcachefs/journal_reclaim.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bcachefs/journal_reclaim.c b/fs/bcachefs/journal_reclaim.c
index b683a13dbf87..e8b7ed8e1333 100644
--- a/fs/bcachefs/journal_reclaim.c
+++ b/fs/bcachefs/journal_reclaim.c
@@ -831,10 +831,12 @@ int bch2_journal_flush_device_pins(struct journal *j, int dev_idx)
seq = 0;
spin_lock(&j->lock);
- while (!ret && seq < j->pin.back) {
+ while (!ret) {
struct bch_replicas_padded replicas;
seq = max(seq, journal_last_seq(j));
+ if (seq >= j->pin.back)
+ break;
bch2_devlist_to_replicas(&replicas.e, BCH_DATA_journal,
journal_seq_pin(j, seq)->devs);
seq++;