From 80846e9c28e76774daf7d2d46115d73f108b98db Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 19 Dec 2020 18:05:09 -0500 Subject: Update bcachefs sources to 5241335413 bcachefs: Fix for spinning in journal reclaim on startup --- libbcachefs/journal_reclaim.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libbcachefs/journal_reclaim.h') diff --git a/libbcachefs/journal_reclaim.h b/libbcachefs/journal_reclaim.h index f02caa3..adf1f5c 100644 --- a/libbcachefs/journal_reclaim.h +++ b/libbcachefs/journal_reclaim.h @@ -53,8 +53,11 @@ static inline void bch2_journal_pin_copy(struct journal *j, struct journal_entry_pin *src, journal_pin_flush_fn flush_fn) { - if (journal_pin_active(src)) - bch2_journal_pin_add(j, src->seq, dst, flush_fn); + /* Guard against racing with journal_pin_drop(src): */ + u64 seq = READ_ONCE(src->seq); + + if (seq) + bch2_journal_pin_add(j, seq, dst, flush_fn); } static inline void bch2_journal_pin_update(struct journal *j, u64 seq, -- cgit v1.2.3