42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From cca1dff8fea3f4ebe8a7f39a109d14a0f136d319 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Fri, 11 Oct 2024 22:53:09 -0400
|
|
Subject: [PATCH 027/233] bcachefs: -o norecovery now bails out of recovery
|
|
earlier
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
-o norecovery (used by the dump tool) should be doing the absolute
|
|
minimum amount of work to get the filesystem up and readable; we
|
|
shouldn't be running check and repair code, or going read-write.
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/recovery.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
|
|
index 0e5a53541ce4..bc2fd174bb32 100644
|
|
--- a/fs/bcachefs/recovery.c
|
|
+++ b/fs/bcachefs/recovery.c
|
|
@@ -690,8 +690,13 @@ int bch2_fs_recovery(struct bch_fs *c)
|
|
goto err;
|
|
}
|
|
|
|
- if (c->opts.norecovery)
|
|
- c->opts.recovery_pass_last = BCH_RECOVERY_PASS_journal_replay - 1;
|
|
+ if (c->opts.norecovery) {
|
|
+ c->opts.recovery_pass_last = c->opts.recovery_pass_last
|
|
+ ? min(c->opts.recovery_pass_last, BCH_RECOVERY_PASS_snapshots_read)
|
|
+ : BCH_RECOVERY_PASS_snapshots_read;
|
|
+ c->opts.nochanges = true;
|
|
+ c->opts.read_only = true;
|
|
+ }
|
|
|
|
mutex_lock(&c->sb_lock);
|
|
struct bch_sb_field_ext *ext = bch2_sb_field_get(c->disk_sb.sb, ext);
|
|
--
|
|
2.45.2
|
|
|