diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-28 19:21:59 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-05-28 19:23:03 -0400 |
| commit | 83208cbf2f08c270033003e10f3e7351de64a5c5 (patch) | |
| tree | 106ede9a5662f9b4a523157b051470a7dce934c9 /fs/bcachefs/fs.c | |
| parent | 8528bde1b66bab9a0abc2f521523abd00049c81b (diff) | |
| download | linux-stable-83208cbf2f08c270033003e10f3e7351de64a5c5.tar.gz linux-stable-83208cbf2f08c270033003e10f3e7351de64a5c5.tar.bz2 linux-stable-83208cbf2f08c270033003e10f3e7351de64a5c5.zip | |
bcachefs: Don't return -EROFS from mount on inconsistency error
We were accidentally returning -EROFS during recovery on filesystem
inconsistency - since this is what the journal returns on emergency
shutdown.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/fs.c')
| -rw-r--r-- | fs/bcachefs/fs.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c index 96040a95cf46..cd388f1702dc 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -1939,8 +1939,7 @@ got_sb: if (IS_ERR(sb)) { ret = PTR_ERR(sb); - ret = bch2_err_class(ret); - return ERR_PTR(ret); + goto err; } c = sb->s_fs_info; @@ -2016,6 +2015,15 @@ out: err_put_super: __bch2_fs_stop(c); deactivate_locked_super(sb); +err: + /* + * On an inconsistency error in recovery we might see an -EROFS derived + * errorcode (from the journal), but we don't want to return that to + * userspace as that causes util-linux to retry the mount RO - which is + * confusing: + */ + if (bch2_err_matches(ret, EROFS) && ret != -EROFS) + ret = -EIO; return ERR_PTR(bch2_err_class(ret)); } |