livepatch: make kobject in klp_object statically allocated

Make kobj variable (of type struct kobject) statically allocated in klp_object structure. It will allow us to move in the func-object-patch hierarchy through kobject links. The only reason to have it dynamic was to not have empty release callback in the code. However we have empty callbacks for function and patch in the code now, so it is no longer valid and the advantage of static allocation is clear.

Miroslav Benes committed 11 years ago

Commit cad706d1 parent 36e505c2 files · +17 −7Browse files

Showing the changes to kernel/livepatch (1 of 2 files). Show all

Unified · Split

kernel/livepatch/core.c+16−6

 	.default_attrs = klp_patch_attrs,
 };
+static void klp_kobj_release_object(struct kobject *kobj)
+{
+}
+static struct kobj_type klp_ktype_object = {
+	.release = klp_kobj_release_object,
+	.sysfs_ops = &kobj_sysfs_ops,
+};
 static void klp_kobj_release_func(struct kobject *kobj)
 {
 }
 	for (obj = patch->objs; obj->funcs && obj != limit; obj++) {
 		klp_free_funcs_limited(obj, NULL);
-		kobject_put(obj->kobj);
+		kobject_put(&obj->kobj);
 	}
 }
 	func->state = KLP_DISABLED;
 	return kobject_init_and_add(&func->kobj, &klp_ktype_func,
-				    obj->kobj, "%s", func->old_name);
+				    &obj->kobj, "%s", func->old_name);
 }
 /* parts of the initialization that is done only when the object is loaded */
 	klp_find_object_module(obj);
 	name = klp_is_module(obj) ? obj->name : "vmlinux";
-	obj->kobj = kobject_create_and_add(name, &patch->kobj);
+	ret = kobject_init_and_add(&obj->kobj, &klp_ktype_object,
-	if (!obj->kobj)
+				   &patch->kobj, "%s", name);
-		return -ENOMEM;
+	if (ret)
+		return ret;
 	for (func = obj->funcs; func->old_name; func++) {
 		ret = klp_init_func(obj, func);
 free:
 	klp_free_funcs_limited(obj, func);
-	kobject_put(obj->kobj);
+	kobject_put(&obj->kobj);
 	return ret;
 }