mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 16:24:13 +08:00
Btrfs: fix panic on error during mount
This needs to be applied on top of my previous patches, but is needed for more than just my new stuff. We're going to the wrong label when we have an error, we try to stop the workers, but they are started below all of this code. This fixes it so we go to the right error label and not panic when we fail one of these cases. Signed-off-by: Josef Bacik <jbacik@redhat.com>
This commit is contained in:
parent
f2b636e80d
commit
c6e2bac1a5
@ -1579,12 +1579,12 @@ struct btrfs_root *open_ctree(struct super_block *sb,
|
||||
|
||||
disk_super = &fs_info->super_copy;
|
||||
if (!btrfs_super_root(disk_super))
|
||||
goto fail_sb_buffer;
|
||||
goto fail_iput;
|
||||
|
||||
ret = btrfs_parse_options(tree_root, options);
|
||||
if (ret) {
|
||||
err = ret;
|
||||
goto fail_sb_buffer;
|
||||
goto fail_iput;
|
||||
}
|
||||
|
||||
features = btrfs_super_incompat_flags(disk_super) &
|
||||
@ -1594,7 +1594,7 @@ struct btrfs_root *open_ctree(struct super_block *sb,
|
||||
"unsupported optional features (%Lx).\n",
|
||||
features);
|
||||
err = -EINVAL;
|
||||
goto fail_sb_buffer;
|
||||
goto fail_iput;
|
||||
}
|
||||
|
||||
features = btrfs_super_compat_ro_flags(disk_super) &
|
||||
@ -1604,7 +1604,7 @@ struct btrfs_root *open_ctree(struct super_block *sb,
|
||||
"unsupported option features (%Lx).\n",
|
||||
features);
|
||||
err = -EINVAL;
|
||||
goto fail_sb_buffer;
|
||||
goto fail_iput;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user