bcachefs: Clean up duplicated code in bch2_journal_halt()

It's now a wrapper around bch2_journal_halt_locked().

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index 366b5493ecf7840aaf17fb0d9203f8f609741289..a51ad32931b895ef1b114902535b7b6f1ea83c32 100644 (file)
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -331,16 +331,6 @@ static void __journal_entry_close(struct journal *j, unsigned closed_val, bool t
        __bch2_journal_buf_put(j, le64_to_cpu(buf->data->seq));
 }
 
-void bch2_journal_halt(struct journal *j)
-{
-       spin_lock(&j->lock);
-       __journal_entry_close(j, JOURNAL_ENTRY_ERROR_VAL, true);
-       if (!j->err_seq)
-               j->err_seq = journal_cur_seq(j);
-       journal_wake(j);
-       spin_unlock(&j->lock);
-}
-
 void bch2_journal_halt_locked(struct journal *j)
 {
        lockdep_assert_held(&j->lock);
@@ -351,6 +341,13 @@ void bch2_journal_halt_locked(struct journal *j)
        journal_wake(j);
 }
 
+void bch2_journal_halt(struct journal *j)
+{
+       spin_lock(&j->lock);
+       bch2_journal_halt_locked(j);
+       spin_unlock(&j->lock);
+}
+
 static bool journal_entry_want_write(struct journal *j)
 {
        bool ret = !journal_entry_is_open(j) ||

diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h
index 886ffd9c0db63a3c2370c25d0406998170d94f6a..8ff00a0ec778aa0d3518f9ece0e28f32836afe4f 100644 (file)
--- a/fs/bcachefs/journal.h
+++ b/fs/bcachefs/journal.h
@@ -426,8 +426,8 @@ int bch2_journal_flush(struct journal *);
 bool bch2_journal_noflush_seq(struct journal *, u64, u64);
 int bch2_journal_meta(struct journal *);
 
-void bch2_journal_halt(struct journal *);
 void bch2_journal_halt_locked(struct journal *);
+void bch2_journal_halt(struct journal *);
 
 static inline int bch2_journal_error(struct journal *j)
 {