Skip to content

Commit

Permalink
Btrfs: fix panic on error during mount
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Josef Bacik authored and Chris Mason committed Dec 2, 2008
1 parent f2b636e commit c6e2bac
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) &
Expand All @@ -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) &
Expand All @@ -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;
}

/*
Expand Down

0 comments on commit c6e2bac

Please sign in to comment.