diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-03 16:21:35 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-03 19:56:33 -0400 |
| commit | 1952c0790c74e4e81d7066a19aabc5c55a13f10f (patch) | |
| tree | 501fa5db6a5f1fd3b2412a2660e995c74ebf0bba /libbcachefs/journal.c | |
| parent | 90d54b388666b258c97be6a4e632824d136356c4 (diff) | |
Update bcachefs sources to c9b4a210f9 fixup! bcachefs: Fixes for going RO
Diffstat (limited to 'libbcachefs/journal.c')
| -rw-r--r-- | libbcachefs/journal.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c index 0a4538b..17dc60d 100644 --- a/libbcachefs/journal.c +++ b/libbcachefs/journal.c @@ -959,15 +959,12 @@ void bch2_dev_journal_stop(struct journal *j, struct bch_dev *ca) void bch2_fs_journal_stop(struct journal *j) { - struct bch_fs *c = container_of(j, struct bch_fs, journal); - bch2_journal_flush_all_pins(j); wait_event(j->wait, journal_entry_close(j)); /* do we need to write another journal entry? */ - if (test_bit(JOURNAL_NOT_EMPTY, &j->flags) || - c->btree_roots_dirty) + if (test_bit(JOURNAL_NOT_EMPTY, &j->flags)) bch2_journal_meta(j); journal_quiesce(j); @@ -1238,14 +1235,14 @@ ssize_t bch2_journal_print_pins(struct journal *j, char *buf) i, atomic_read(&pin_list->count)); list_for_each_entry(pin, &pin_list->list, list) - pr_buf(&out, "\t%p %pf\n", + pr_buf(&out, "\t%px %ps\n", pin, pin->flush); if (!list_empty(&pin_list->flushed)) pr_buf(&out, "flushed:\n"); list_for_each_entry(pin, &pin_list->flushed, list) - pr_buf(&out, "\t%p %pf\n", + pr_buf(&out, "\t%px %ps\n", pin, pin->flush); } spin_unlock(&j->lock); |