diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-08 22:27:03 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:06 -0400 |
| commit | 10a6ced2da8e4b53a14ab172b0ce70b83543bbfb (patch) | |
| tree | 95533086990802eec459c2f8f99381e8902c2a19 /fs/bcachefs/recovery.c | |
| parent | 9a644843c4701f86594fe0386f00af6b847f747d (diff) | |
| download | lwn-10a6ced2da8e4b53a14ab172b0ce70b83543bbfb.tar.gz lwn-10a6ced2da8e4b53a14ab172b0ce70b83543bbfb.zip | |
bcachefs: Kill bch2_bucket_gens_read()
This folds bch2_bucket_gens_read() into bch2_alloc_read(), doing the
version check there.
This is prep work for enumarating all recovery passes: we need some
cleanup first to make calling all the recovery passes consistent.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -rw-r--r-- | fs/bcachefs/recovery.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index c90205aa223e..4c61a28e492c 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -1309,11 +1309,7 @@ use_clean: goto err; bch_verbose(c, "starting alloc read"); - down_read(&c->gc_lock); - ret = c->sb.version < bcachefs_metadata_version_bucket_gens - ? bch2_alloc_read(c) - : bch2_bucket_gens_read(c); - up_read(&c->gc_lock); + ret = bch2_alloc_read(c); if (ret) goto err; bch_verbose(c, "alloc read done"); |