diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-24 01:26:40 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-24 01:26:40 -0500 |
| commit | 03272a1e5559ce508400862285b8a3f05c500955 (patch) | |
| tree | 64518b8cae701eb751fcf341da5e7178a49b3021 /libbcachefs/super.c | |
| parent | 010182e79051fccbedc35aaa55dc67266ae3b3d0 (diff) | |
Update bcachefs sources to a623b3063d5d bcachefs: Fix check_snapshot() memcpy
Diffstat (limited to 'libbcachefs/super.c')
| -rw-r--r-- | libbcachefs/super.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libbcachefs/super.c b/libbcachefs/super.c index a7f9de22..46da8204 100644 --- a/libbcachefs/super.c +++ b/libbcachefs/super.c @@ -286,8 +286,13 @@ static void __bch2_fs_read_only(struct bch_fs *c) if (test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags) && !test_bit(BCH_FS_emergency_ro, &c->flags)) set_bit(BCH_FS_clean_shutdown, &c->flags); + bch2_fs_journal_stop(&c->journal); + bch_info(c, "%sshutdown complete, journal seq %llu", + test_bit(BCH_FS_clean_shutdown, &c->flags) ? "" : "un", + c->journal.seq_ondisk); + /* * After stopping journal: */ @@ -461,6 +466,7 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early) * at least one non-flush write in the journal or recovery will fail: */ set_bit(JOURNAL_NEED_FLUSH_WRITE, &c->journal.flags); + set_bit(JOURNAL_RUNNING, &c->journal.flags); for_each_rw_member(c, ca) bch2_dev_allocator_add(c, ca); |