| Message ID | 20121130225619.GD6021@htj.dyndns.org |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 30 Nov 2012, Tejun Heo wrote: > Hey, again. > > Can you please test whether the following patch makes any difference? > > Thanks! > > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index 042d221..26368ef 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -1477,7 +1477,10 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, > } while (unlikely(ret == -EAGAIN)); > > if (likely(ret >= 0)) { > - __queue_delayed_work(cpu, wq, dwork, delay); > + if (!delay) > + __queue_work(cpu, wq, &dwork->work); > + else > + __queue_delayed_work(cpu, wq, dwork, delay); > local_irq_restore(flags); > } > Yes. I tested that both directly on top of the bad commit, and on v3.7-rc7, and it fixes the bug in both cases. Thanks, Anders -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 042d221..26368ef 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1477,7 +1477,10 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, } while (unlikely(ret == -EAGAIN)); if (likely(ret >= 0)) { - __queue_delayed_work(cpu, wq, dwork, delay); + if (!delay) + __queue_work(cpu, wq, &dwork->work); + else + __queue_delayed_work(cpu, wq, dwork, delay); local_irq_restore(flags); }