Update bcachefs sources to 2272c5f5b7 bcachefs: Mark stripe buckets with correct...

[bcachefs-tools-debian] / libbcachefs / journal_reclaim.c

diff --git a/libbcachefs/journal_reclaim.c b/libbcachefs/journal_reclaim.c
index 9f8b63b340f71b3280c563e9aa41c14bc1fdc3de..8744581dfda7de7bad38aa65ad66b9aca27562a1 100644 (file)
--- a/libbcachefs/journal_reclaim.c
+++ b/libbcachefs/journal_reclaim.c
@@ -232,7 +232,7 @@ void bch2_journal_space_available(struct journal *j)
        if ((j->space[journal_space_clean_ondisk].next_entry <
             j->space[journal_space_clean_ondisk].total) &&
            (clean - clean_ondisk <= total / 8) &&
-           (clean_ondisk * 2 > clean ))
+           (clean_ondisk * 2 > clean))
                set_bit(JOURNAL_MAY_SKIP_FLUSH, &j->flags);
        else
                clear_bit(JOURNAL_MAY_SKIP_FLUSH, &j->flags);
@@ -347,13 +347,13 @@ void bch2_journal_pin_put(struct journal *j, u64 seq)
        }
 }
 
-static inline void __journal_pin_drop(struct journal *j,
+static inline bool __journal_pin_drop(struct journal *j,
                                      struct journal_entry_pin *pin)
 {
        struct journal_entry_pin_list *pin_list;
 
        if (!journal_pin_active(pin))
-               return;
+               return false;
 
        if (j->flush_in_progress == pin)
                j->flush_in_progress_dropped = true;
@@ -366,16 +366,16 @@ static inline void __journal_pin_drop(struct journal *j,
         * Unpinning a journal entry make make journal_next_bucket() succeed, if
         * writing a new last_seq will now make another bucket available:
         */
-       if (atomic_dec_and_test(&pin_list->count) &&
-           pin_list == &fifo_peek_front(&j->pin))
-               bch2_journal_reclaim_fast(j);
+       return atomic_dec_and_test(&pin_list->count) &&
+               pin_list == &fifo_peek_front(&j->pin);
 }
 
 void bch2_journal_pin_drop(struct journal *j,
                           struct journal_entry_pin *pin)
 {
        spin_lock(&j->lock);
-       __journal_pin_drop(j, pin);
+       if (__journal_pin_drop(j, pin))
+               bch2_journal_reclaim_fast(j);
        spin_unlock(&j->lock);
 }
 
@@ -384,6 +384,7 @@ void bch2_journal_pin_set(struct journal *j, u64 seq,
                          journal_pin_flush_fn flush_fn)
 {
        struct journal_entry_pin_list *pin_list;
+       bool reclaim;
 
        spin_lock(&j->lock);
 
@@ -400,7 +401,7 @@ void bch2_journal_pin_set(struct journal *j, u64 seq,
 
        pin_list = journal_seq_pin(j, seq);
 
-       __journal_pin_drop(j, pin);
+       reclaim = __journal_pin_drop(j, pin);
 
        atomic_inc(&pin_list->count);
        pin->seq        = seq;
@@ -412,6 +413,9 @@ void bch2_journal_pin_set(struct journal *j, u64 seq,
                list_add(&pin->list, &pin_list->list);
        else
                list_add(&pin->list, &pin_list->flushed);
+
+       if (reclaim)
+               bch2_journal_reclaim_fast(j);
        spin_unlock(&j->lock);
 
        /*
@@ -641,7 +645,8 @@ static int __bch2_journal_reclaim(struct journal *j, bool direct, bool kicked)
 
                min_key_cache = min(bch2_nr_btree_keys_need_flush(c), (size_t) 128);
 
-               trace_journal_reclaim_start(c, direct, kicked,
+               trace_and_count(c, journal_reclaim_start, c,
+                               direct, kicked,
                                min_nr, min_key_cache,
                                j->prereserved.reserved,
                                j->prereserved.remaining,
@@ -657,7 +662,7 @@ static int __bch2_journal_reclaim(struct journal *j, bool direct, bool kicked)
                        j->nr_direct_reclaim += nr_flushed;
                else
                        j->nr_background_reclaim += nr_flushed;
-               trace_journal_reclaim_finish(c, nr_flushed);
+               trace_and_count(c, journal_reclaim_finish, c, nr_flushed);
 
                if (nr_flushed)
                        wake_up(&j->reclaim_wait);
@@ -702,7 +707,7 @@ static int bch2_journal_reclaim_thread(void *arg)
                        j->next_reclaim = now + delay;
 
                while (1) {
-                       set_current_state(TASK_INTERRUPTIBLE);
+                       set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE);
                        if (kthread_should_stop())
                                break;
                        if (j->reclaim_kicked)
@@ -713,9 +718,9 @@ static int bch2_journal_reclaim_thread(void *arg)
                        spin_unlock(&j->lock);
 
                        if (journal_empty)
-                               freezable_schedule();
+                               schedule();
                        else if (time_after(j->next_reclaim, jiffies))
-                               freezable_schedule_timeout(j->next_reclaim - jiffies);
+                               schedule_timeout(j->next_reclaim - jiffies);
                        else
                                break;
                }