From: Kay Sievers 
Sysfs symlinks now require fully registered kobjects as a target,

otherwise the call to create a symlink will fail. Here we register

the kobject before we request the symlink in the holders directory.
Signed-off-by: Kay Sievers

Cc: Tejun Heo

Signed-off-by: Greg Kroah-Hartman

---

 kernel/module.c |   15 +++++++--------

 1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c

index dc4d3f5..0ae8117 100644

--- a/kernel/module.c

+++ b/kernel/module.c

@@ -1227,6 +1227,8 @@ int mod_sysfs_init(struct module *mod)
 	kobject_init(&mod->mkobj.kobj);
+	/* delay uevent until full sysfs population */

+	err = kobject_add(&mod->mkobj.kobj);

 out:

 	return err;

 }

@@ -1237,11 +1239,6 @@ int mod_sysfs_setup(struct module *mod,

 {

 	int err;
-	/* delay uevent until full sysfs population */

-	err = kobject_add(&mod->mkobj.kobj);

-	if (err)

-		goto out;

-

 	mod->holders_dir = kobject_create_and_add("holders", &mod->mkobj.kobj);

 	if (!mod->holders_dir) {

 		err = -ENOMEM;

@@ -1266,7 +1263,6 @@ out_unreg_holders:

 out_unreg:

 	kobject_del(&mod->mkobj.kobj);

 	kobject_put(&mod->mkobj.kobj);

-out:

 	return err;

 }

 #endif

@@ -1883,10 +1879,10 @@ static struct module *load_module(void __user *umod,

 	/* Now we've moved module, initialize linked lists, etc. */

 	module_unload_init(mod);
-	/* Initialize kobject, so we can reference it. */

+	/* add kobject, so we can reference it. */

 	err = mod_sysfs_init(mod);

 	if (err)

-		goto cleanup;

+		goto free_unload;
 	/* Set up license info based on the info section */

 	set_license(mod, get_modinfo(sechdrs, infoindex, "license"));

@@ -2056,6 +2052,9 @@ static struct module *load_module(void __user *umod,

  arch_cleanup:

 	module_arch_cleanup(mod);

  cleanup:

+	kobject_del(&mod->mkobj.kobj);

+	kobject_put(&mod->mkobj.kobj);

+ free_unload:

 	module_unload_free(mod);

 	module_free(mod, mod->module_init);

  free_core:

--

1.5.3.8
--

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/