From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 29 Oct 2012 11:47:13 +0200 From: Andrei Emeltchenko To: Tejun Heo , Gustavo Padovan , linux-bluetooth@vger.kernel.org Cc: Dan Magenheimer , linux-kernel@vger.kernel.org, Konrad Wilk Subject: Re: [PATCH] workqueue: cancel_delayed_work() should return %NULL if work item is idle Message-ID: <20121029094707.GC9314@aemeltch-MOBL1> References: <444a6439-b1a4-4740-9e7e-bc37267cfe73@default> <20121018233928.GY13370@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20121018233928.GY13370@google.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Gustavo, could you apply the patch below to bluetooth-next tree, otherwise it is deadly broken. Best regards Andrei Emeltchenko On Thu, Oct 18, 2012 at 04:39:28PM -0700, Tejun Heo wrote: > From e65120fcfc1cb9697655d29ecd7982451c05d3c2 Mon Sep 17 00:00:00 2001 > From: Dan Magenheimer > Date: Thu, 18 Oct 2012 16:31:37 -0700 > > 57b30ae77b ("workqueue: reimplement cancel_delayed_work() using > try_to_grab_pending()") made cancel_delayed_work() always return %true > unless someone else is also trying to cancel the work item, which is > broken - if the target work item is idle, the return value should be > %false. > > try_to_grab_pending() indicates that the target work item was idle by > zero return value. Use it for return. Note that this brings > cancel_delayed_work() in line with __cancel_work_timer() in return > value handling. > > Signed-off-by: Dan Magenheimer > Signed-off-by: Tejun Heo > LKML-Reference: <444a6439-b1a4-4740-9e7e-bc37267cfe73@default> > --- > kernel/workqueue.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index d951daa..042d221 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -2982,7 +2982,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) > > set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work)); > local_irq_restore(flags); > - return true; > + return ret; > } > EXPORT_SYMBOL(cancel_delayed_work); > > -- > 1.7.7.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/