diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-22 20:45:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-23 15:53:37 -0400 |
| commit | 55142cd0b5ef2a2150d4708dad0c3fd54a3ffd39 (patch) | |
| tree | 81397095a23b5432d2ae14ca40d72fb37189bce5 /libbcachefs/super.c | |
| parent | fe1bb39aa52d9140981ba1e96f3c95ddf14006ce (diff) | |
Update bcachefs sources to ca3cfad39f fixup! bcachefs: Improve iter->should_be_locked
Diffstat (limited to 'libbcachefs/super.c')
| -rw-r--r-- | libbcachefs/super.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libbcachefs/super.c b/libbcachefs/super.c index 2a570eb0..13a5ca71 100644 --- a/libbcachefs/super.c +++ b/libbcachefs/super.c @@ -269,7 +269,7 @@ static void bch2_writes_disabled(struct percpu_ref *writes) void bch2_fs_read_only(struct bch_fs *c) { if (!test_bit(BCH_FS_RW, &c->flags)) { - BUG_ON(c->journal.reclaim_thread); + bch2_journal_reclaim_stop(&c->journal); return; } @@ -431,12 +431,6 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early) for_each_rw_member(ca, c, i) bch2_wake_allocator(ca); - ret = bch2_journal_reclaim_start(&c->journal); - if (ret) { - bch_err(c, "error starting journal reclaim: %i", ret); - return ret; - } - if (!early) { ret = bch2_fs_read_write_late(c); if (ret) |