On Thu, Jul 12, 2012 at 02:09:35PM +0800, Dong Hao wrote:Greg, sorry for the noise caused by wrong configuration of email client.The printk() function at the end of function kobject_init() already had '\n',You were already told why this patch is incorrect, why are you resending
so remove it.
While the kobject has been initialized, assign error string and
jump to error case directly.
Signed-off-by: Dong Hao<haodong@xxxxxxxxxxxxxxxxxx>
---
lib/kobject.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/kobject.c b/lib/kobject.c
index 05de4dc..7b8a09c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -278,14 +278,13 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype)
goto error;
}
if (!ktype) {
- err_str = "must have a ktype to be initialized properly!\n";
+ err_str = "must have a ktype to be initialized properly!";
goto error;
}
if (kobj->state_initialized) {
- /* do not error out as sometimes we can recover */
- printk(KERN_ERR "kobject (%p): tried to init an initialized "
- "object, something is seriously wrong.\n", kobj);
- dump_stack();
+ err_str = "tried to init an initialized "
+ "object, something is seriously wrong.";
+ goto error;
it two more times? That's a bit annoying and rude, don't you think?
Sorry, I can't take this, please read the code you are modifying.
greg k-h