Attachment 105412 Details for Bug 135202 – Updated lib/kobject.patch based on feed back up stream

[patch] Updated lib/kobject.patch based on feed back up stream

linux-2.6.9-kobject.patch (text/plain), 1.93 KB, created by Andrew Duggan on 2004-10-19 01:07:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Duggan

Created: 2004-10-19 01:07:47 UTC

Size: 1.93 KB

patch

obsolete

>diff -Nru a/lib/kobject.c b/lib/kobject.c
>--- a/lib/kobject.c	2004-10-18 18:53:26.000000000 -0400
>+++ b/lib/kobject.c	2004-10-18 19:07:27.267195674 -0400
>@@ -131,8 +131,10 @@ static void kset_hotplug(const char *act
> 	char *argv [3];
> 	char **envp = NULL;
> 	char *buffer = NULL;
>+	char *buffer_seq = NULL;
> 	char *scratch;
> 	int i = 0;
>+	int iseq = 0;
> 	int retval;
> 	char *kobj_path = NULL;
> 	char *name = NULL;
>@@ -159,6 +161,12 @@ static void kset_hotplug(const char *act
> 	if (!buffer)
> 		goto exit;
> 
>+	/* I hate to waste space, Could be 
>+	   buffer_seq = kmalloc(BUFFER_SIZE, GFP_KERNEL); */
>+	buffer_seq = kmalloc((8*sizeof(char)) + (sizeof(char)*(8*sizeof(sequence_num))), GFP_KERNEL);
>+	if (!buffer_seq)
>+		goto exit;
>+
> 	if (kset->hotplug_ops->name)
> 		name = kset->hotplug_ops->name(kset, kobj);
> 	if (name == NULL)
>@@ -177,17 +185,13 @@ static void kset_hotplug(const char *act
> 	envp [i++] = scratch;
> 	scratch += sprintf(scratch, "ACTION=%s", action) + 1;
> 
>-	spin_lock(&sequence_lock);
>-	seq = sequence_num++;
>-	spin_unlock(&sequence_lock);
>-
>-	envp [i++] = scratch;
>-	scratch += sprintf(scratch, "SEQNUM=%ld", seq) + 1;
>-
> 	kobj_path = kobject_get_path(kset, kobj, GFP_KERNEL);
> 	if (!kobj_path)
> 		goto exit;
> 
>+	/* Reserve a spot for the seqnum */
>+	iseq = i++;
>+
> 	envp [i++] = scratch;
> 	scratch += sprintf (scratch, "DEVPATH=%s", kobj_path) + 1;
> 
>@@ -203,6 +207,14 @@ static void kset_hotplug(const char *act
> 		}
> 	}
> 
>+	/* Now we can take a sequence number */
>+	spin_lock(&sequence_lock);
>+	seq = sequence_num++;
>+	spin_unlock(&sequence_lock);
>+
>+	envp [iseq] = buffer_seq;
>+	sprintf(buffer_seq, "SEQNUM=%ld", seq);
>+
> 	pr_debug ("%s: %s %s %s %s %s %s %s\n", __FUNCTION__, argv[0], argv[1],
> 		  envp[0], envp[1], envp[2], envp[3], envp[4]);
> 	retval = call_usermodehelper (argv[0], argv, envp, 0);
>@@ -213,6 +225,7 @@ static void kset_hotplug(const char *act
> exit:
> 	kfree(kobj_path);
> 	kfree(buffer);
>+	kfree(buffer_seq);
> 	kfree(envp);
> 	return;
> }

Actions: View | Diff

Attachments on bug 135202: 104979 | 104980 | 104981 | 105002 | 105003 | 105004 | 105006 | 105264 | 105265 | 105266 | 105267 | 105341 | 105412