[PATCH] Fixes for the deferqueue_add() function

[PATCH] Fixes for the deferqueue_add() function

[Dan Smith]

I'm not sure how the deferqueue would (or has ever) worked without these
modifications, but I had to make them in order to use it :)

Cc: orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org
Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 kernel/deferqueue.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/deferqueue.c b/kernel/deferqueue.c
index efd99d5..470b8a3 100644
--- a/kernel/deferqueue.c
+++ b/kernel/deferqueue.c
@@ -66,18 +66,19 @@ int deferqueue_add(struct deferqueue_head *head, void *data, int size,
 {
 	struct deferqueue_entry *dq;
 
-	dq = kmalloc(sizeof(dq) + size, GFP_KERNEL);
+	dq = kmalloc(sizeof(*dq) + size, GFP_KERNEL);
 	if (!dq)
 		return -ENOMEM;
 
 	dq->function = func;
 	dq->destructor = dtor;
+	INIT_LIST_HEAD(&dq->list);
 	memcpy(dq->data, data, size);
 
 	pr_debug("%s: adding work %p func %p dtor %p\n",
 		 __func__, dq, func, dtor);
 	spin_lock(&head->lock);
-	list_add_tail(&head->list, &dq->list);
+	list_add_tail(&dq->list, &head->list);
 	spin_unlock(&head->lock);
 	return 0;
 }
-- 
1.6.0.4

Re: [PATCH] Fixes for the deferqueue_add() function

[Serge E. Hallyn]

Quoting Dan Smith (danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org):
> I'm not sure how the deferqueue would (or has ever) worked without these
> modifications, but I had to make them in order to use it :)
> 
> Cc: orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org
> Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  kernel/deferqueue.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/deferqueue.c b/kernel/deferqueue.c
> index efd99d5..470b8a3 100644
> --- a/kernel/deferqueue.c
> +++ b/kernel/deferqueue.c
> @@ -66,18 +66,19 @@ int deferqueue_add(struct deferqueue_head *head, void *data, int size,
>  {
>  	struct deferqueue_entry *dq;
> 
> -	dq = kmalloc(sizeof(dq) + size, GFP_KERNEL);
> +	dq = kmalloc(sizeof(*dq) + size, GFP_KERNEL);

huh.  yeah.

>  	if (!dq)
>  		return -ENOMEM;
> 
>  	dq->function = func;
>  	dq->destructor = dtor;
> +	INIT_LIST_HEAD(&dq->list);

I'm pretty sure only head->list needed to be initialized.

>  	memcpy(dq->data, data, size);
> 
>  	pr_debug("%s: adding work %p func %p dtor %p\n",
>  		 __func__, dq, func, dtor);
>  	spin_lock(&head->lock);
> -	list_add_tail(&head->list, &dq->list);
> +	list_add_tail(&dq->list, &head->list);

at least after you've done this :)

>  	spin_unlock(&head->lock);
>  	return 0;
>  }
> -- 
> 1.6.0.4
> 
> _______________________________________________
> Containers mailing list
> Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
> https://lists.linux-foundation.org/mailman/listinfo/containers

Re: [PATCH] Fixes for the deferqueue_add() function

[Dan Smith]

>> +	INIT_LIST_HEAD(&dq->list);

SH> I'm pretty sure only head->list needed to be initialized.

>> -	list_add_tail(&head->list, &dq->list);
>> +	list_add_tail(&dq->list, &head->list);

SH> at least after you've done this :)

Right, right, well, it was part of the process... :)

-- 
Dan Smith
IBM Linux Technology Center
email: danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org