diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-08 22:21:45 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:06 -0400 |
| commit | 9a644843c4701f86594fe0386f00af6b847f747d (patch) | |
| tree | 73761c444c1d06af4fab4c3cc981e23d7365d245 /fs | |
| parent | 3045bb958acf5d3bc799c791d14e40676477bd16 (diff) | |
| download | linux-stable-9a644843c4701f86594fe0386f00af6b847f747d.tar.gz linux-stable-9a644843c4701f86594fe0386f00af6b847f747d.tar.bz2 linux-stable-9a644843c4701f86594fe0386f00af6b847f747d.zip | |
bcachefs: Fix error path in bch2_journal_flush_device_pins()
We need to always call bch2_replicas_gc_end() after we've called
bch2_replicas_gc_start(), else we leave state around that needs to be
cleaned up.
Partial fix for: https://github.com/koverstreet/bcachefs/issues/560
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -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); |