diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-09 20:22:58 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:50 +0300 |
| commit | dd81a060eb0680e09d133b81db54b90442c32b5e (patch) | |
| tree | eb914eacc72d4cc901b9f443353e3847612dbea9 /fs/bcachefs/super.c | |
| parent | 06ab86d596170b9f3b88ce3f8e9fea7e9c1ea0c2 (diff) | |
| download | linux-dd81a060eb0680e09d133b81db54b90442c32b5e.tar.xz | |
bcachefs: ec_stripe_delete_work() now takes ref on c->writes
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/super.c')
| -rw-r--r-- | fs/bcachefs/super.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c index c911a07f8e8e..7dfe9050a006 100644 --- a/fs/bcachefs/super.c +++ b/fs/bcachefs/super.c @@ -258,8 +258,6 @@ void bch2_fs_read_only(struct bch_fs *c) */ percpu_ref_kill(&c->writes); - cancel_work_sync(&c->ec_stripe_delete_work); - /* * If we're not doing an emergency shutdown, we want to wait on * outstanding writes to complete so they don't see spurious errors due @@ -391,9 +389,6 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early) bch2_dev_allocator_add(c, ca); bch2_recalc_capacity(c); - bch2_do_discards(c); - bch2_do_invalidates(c); - if (!early) { ret = bch2_fs_read_write_late(c); if (ret) @@ -403,6 +398,10 @@ static int __bch2_fs_read_write(struct bch_fs *c, bool early) percpu_ref_reinit(&c->writes); set_bit(BCH_FS_RW, &c->flags); set_bit(BCH_FS_WAS_RW, &c->flags); + + bch2_do_discards(c); + bch2_do_invalidates(c); + bch2_do_stripe_deletes(c); return 0; err: __bch2_fs_read_only(c); |