diff options
| -rw-r--r-- | fs/bcachefs/journal_reclaim.c | 8 | ||||
| -rw-r--r-- | fs/bcachefs/replicas.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/fs/bcachefs/journal_reclaim.c b/fs/bcachefs/journal_reclaim.c index 72486f1f8a8e..8de83e103751 100644 --- a/fs/bcachefs/journal_reclaim.c +++ b/fs/bcachefs/journal_reclaim.c @@ -845,10 +845,8 @@ int bch2_journal_flush_device_pins(struct journal *j, int dev_idx) * expects to find devices marked for journal data on unclean mount. */ ret = bch2_journal_meta(&c->journal); - if (ret) { - mutex_unlock(&c->replicas_gc_lock); - return ret; - } + if (ret) + goto err; seq = 0; spin_lock(&j->lock); @@ -867,7 +865,7 @@ int bch2_journal_flush_device_pins(struct journal *j, int dev_idx) spin_lock(&j->lock); } spin_unlock(&j->lock); - +err: ret = bch2_replicas_gc_end(c, ret); mutex_unlock(&c->replicas_gc_lock); diff --git a/fs/bcachefs/replicas.c b/fs/bcachefs/replicas.c index d4c1d43e8c41..5b591c59bc3e 100644 --- a/fs/bcachefs/replicas.c +++ b/fs/bcachefs/replicas.c @@ -462,6 +462,9 @@ int bch2_replicas_gc_end(struct bch_fs *c, int ret) { lockdep_assert_held(&c->replicas_gc_lock); + if (ret) + goto err; + mutex_lock(&c->sb_lock); percpu_down_write(&c->mark_lock); |