> @@ -4861,10 +4861,8 @@ int __init_or_module cgroup_load_subsys(struct
> cgroup_subsys *ss)
> */
> css = ss->css_alloc(cgroup_css(cgroup_dummy_top, ss));
> if (IS_ERR(css)) {
> - /* failure case - need to deassign the cgroup_subsys[] slot. */
> - cgroup_subsys[ss->subsys_id] = NULL;
> - mutex_unlock(&cgroup_mutex);
> - return PTR_ERR(css);
> + ret = PTR_ERR(css);
> + goto out_err;
> }
>
> list_add(&ss->sibling, &cgroup_dummy_root.subsys_list);
> @@ -4873,6 +4871,10 @@ int __init_or_module cgroup_load_subsys(struct
> cgroup_subsys *ss)
> /* our new subsystem will be attached to the dummy hierarchy. */
> init_css(css, ss, cgroup_dummy_top);
>
> + ret = online_css(css);
> + if (ret)
> + goto free_css;
> +
> /*
> * Now we need to entangle the css into the existing css_sets. unlike
> * in cgroup_init_subsys, there are now multiple css_sets, so each one
> @@ -4896,18 +4898,17 @@ int __init_or_module cgroup_load_subsys(struct
> cgroup_subsys *ss)
> }
> write_unlock(&css_set_lock);
>
> - ret = online_css(css);
> - if (ret)
> - goto err_unload;
> -
Moving online_css() upwards should be fine.
Acked-by: Li Zefan <lize...@huawei.com>
> /* success! */
> mutex_unlock(&cgroup_mutex);
> return 0;
>
> -err_unload:
> +free_css:
> + list_del(&ss->sibling);
> + ss->css_free(css);
> +out_err:
> + /* failure case - need to deassign the cgroup_subsys[] slot. */
> + cgroup_subsys[ss->subsys_id] = NULL;
> mutex_unlock(&cgroup_mutex);
> - /* @ss can't be mounted here as try_module_get() would fail */
> - cgroup_unload_subsys(ss);
> return ret;
> }
> EXPORT_SYMBOL_GPL(cgroup_load_subsys);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
