Skip to content

Commit 282029c

Browse files
djbwgregkh
authored andcommitted
kobject: provide more diagnostic info for kobject_add_internal() failures
1/ convert open-coded KERN_ERR+dump_stack() to WARN(), so that automated tools pick up this warning. 2/ include the 'child' and 'parent' kobject names. This information was useful for tracking down the case where scsi invoked device_del() on a parent object and subsequently invoked device_add() on a child. Now the warning looks like: kobject_add_internal failed for target8:0:16 (error: -2 parent: end_device-8:0:24) Pid: 2942, comm: scsi_scan_8 Not tainted 3.3.0-rc7-isci+ #2 Call Trace: [<ffffffff8125e551>] kobject_add_internal+0x1c1/0x1f3 [<ffffffff81075149>] ? trace_hardirqs_on+0xd/0xf [<ffffffff8125e659>] kobject_add_varg+0x41/0x50 [<ffffffff8125e723>] kobject_add+0x64/0x66 [<ffffffff8131124b>] device_add+0x12d/0x63a [<ffffffff8125e0ef>] ? kobject_put+0x4c/0x50 [<ffffffff8132f370>] scsi_sysfs_add_sdev+0x4e/0x28a [<ffffffff8132dce3>] do_scan_async+0x9c/0x145 Cc: Greg Kroah-Hartman <[email protected]> Cc: James Bottomley <[email protected]> Signed-off-by: Dan Williams <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3a19888 commit 282029c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

lib/kobject.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ static int kobject_add_internal(struct kobject *kobj)
192192

193193
/* be noisy on error issues */
194194
if (error == -EEXIST)
195-
printk(KERN_ERR "%s failed for %s with "
196-
"-EEXIST, don't try to register things with "
197-
"the same name in the same directory.\n",
198-
__func__, kobject_name(kobj));
195+
WARN(1, "%s failed for %s with "
196+
"-EEXIST, don't try to register things with "
197+
"the same name in the same directory.\n",
198+
__func__, kobject_name(kobj));
199199
else
200-
printk(KERN_ERR "%s failed for %s (%d)\n",
201-
__func__, kobject_name(kobj), error);
202-
dump_stack();
200+
WARN(1, "%s failed for %s (error: %d parent: %s)\n",
201+
__func__, kobject_name(kobj), error,
202+
parent ? kobject_name(parent) : "'none'");
203203
} else
204204
kobj->state_in_sysfs = 1;
205205

0 commit comments

Comments
 (0)