OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Josef Bacik 2008-12-02 06:36:10 -05:00 committed by Chris Mason
parent f2b636e80d
commit c6e2bac1a5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/disk-io.c
View File

@ -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;
}
/*