Re: 2.6.15-rc2-mm1

[Alexandre Buisse]

Andrew Morton wrote:

>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.15-rc2/2.6.15-rc2-mm1/
>
>
>  
>
Hi Andrew,

I had this compilation error :


  LD      .tmp_vmlinux1
drivers/built-in.o: In function `do_uevent':
lockspace.c:(.text+0x148ae7): undefined reference to `kobject_hotplug'
lockspace.c:(.text+0x148b9e): undefined reference to `kobject_hotplug'

DLM was still using kobject_hotplug, which seems to have been removed in
-mm. Brice kindly indicated me how to fix this, in exchange for half a
signed-off, so please see the attached patch. I grep'd the whole source
and did not find any other reference to kobject_hotplug.

Regards,
Alexandre

Signed-off-by: Alexandre Buisse <alexandre.buisse@xxxxxxxxxxx>
Signed-off-by: Brice Goglin <brice.goglin@xxxxxxxxxxxx>
--- drivers/dlm/lockspace.c.old	2005-11-24 19:32:11.000000000 +0100
+++ drivers/dlm/lockspace.c	2005-11-24 19:39:59.000000000 +0100
@@ -157,9 +157,9 @@
 	int error;
 
 	if (in)
-		kobject_hotplug(&ls->ls_kobj, KOBJ_ONLINE);
+		kobject_uevent(&ls->ls_kobj, KOBJ_ONLINE);
 	else
-		kobject_hotplug(&ls->ls_kobj, KOBJ_OFFLINE);
+		kobject_uevent(&ls->ls_kobj, KOBJ_OFFLINE);
 
 	error = wait_event_interruptible(ls->ls_uevent_wait,
 			test_and_clear_bit(LSFL_UEVENT_WAIT, &ls->ls_flags));