From db931a4571817d7d61be6bce306f1d42f7cd3398 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 4 Dec 2020 13:41:49 -0500 Subject: Update bcachefs sources to e1d0fb8c5f bcachefs: Don't require flush/fua on every journal write --- libbcachefs/journal_reclaim.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libbcachefs/journal_reclaim.h') diff --git a/libbcachefs/journal_reclaim.h b/libbcachefs/journal_reclaim.h index e2535504..f02caa3d 100644 --- a/libbcachefs/journal_reclaim.h +++ b/libbcachefs/journal_reclaim.h @@ -4,12 +4,6 @@ #define JOURNAL_PIN (32 * 1024) -enum journal_space_from { - journal_space_discarded, - journal_space_clean_ondisk, - journal_space_clean, -}; - static inline void journal_reclaim_kick(struct journal *j) { struct task_struct *p = READ_ONCE(j->reclaim_thread); @@ -39,6 +33,7 @@ journal_seq_pin(struct journal *j, u64 seq) return &j->pin.data[seq & j->pin.mask]; } +void __bch2_journal_pin_put(struct journal *, u64); void bch2_journal_pin_put(struct journal *, u64); void bch2_journal_pin_drop(struct journal *, struct journal_entry_pin *); @@ -73,7 +68,7 @@ static inline void bch2_journal_pin_update(struct journal *j, u64 seq, void bch2_journal_pin_flush(struct journal *, struct journal_entry_pin *); void bch2_journal_do_discards(struct journal *); -void bch2_journal_reclaim(struct journal *); +int bch2_journal_reclaim(struct journal *); void bch2_journal_reclaim_stop(struct journal *); int bch2_journal_reclaim_start(struct journal *); -- cgit v1.2.3