diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-07 12:32:50 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-01 11:47:37 -0500 |
| commit | df8e13ccf3c0cc2b16e931f71ef69834db71eda9 (patch) | |
| tree | f4f07f2b6c18f797de6be800e6bb865dfc568c38 /fs/bcachefs/journal_reclaim.h | |
| parent | fa5df9e7d5a85507cc01f32815854993983c1ff5 (diff) | |
| download | linux-df8e13ccf3c0cc2b16e931f71ef69834db71eda9.tar.gz linux-df8e13ccf3c0cc2b16e931f71ef69834db71eda9.tar.bz2 linux-df8e13ccf3c0cc2b16e931f71ef69834db71eda9.zip | |
bcachefs: Add an assertion in bch2_journal_pin_set()
Previously, bch2_journal_pin_set() would silently ignore a request to
pin a journal sequence number that was no longer dirty, because it was
used internally by bch2_journal_pin_copy() which could race with the src
pin being flushed.
Split these apart so that we can properly assert that @seq is a
currently dirty journal sequence number - this is almost always a bug.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal_reclaim.h')
| -rw-r--r-- | fs/bcachefs/journal_reclaim.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/fs/bcachefs/journal_reclaim.h b/fs/bcachefs/journal_reclaim.h index 494d1a6eddb0..7b15d682a0f5 100644 --- a/fs/bcachefs/journal_reclaim.h +++ b/fs/bcachefs/journal_reclaim.h @@ -47,17 +47,10 @@ static inline void bch2_journal_pin_add(struct journal *j, u64 seq, bch2_journal_pin_set(j, seq, pin, flush_fn); } -static inline void bch2_journal_pin_copy(struct journal *j, - struct journal_entry_pin *dst, - struct journal_entry_pin *src, - journal_pin_flush_fn 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); -} +void bch2_journal_pin_copy(struct journal *, + struct journal_entry_pin *, + struct journal_entry_pin *, + journal_pin_flush_fn); static inline void bch2_journal_pin_update(struct journal *j, u64 seq, struct journal_entry_pin *pin, |