From: Andrew Morton <akpm@osdl.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: mixxel@cs.auc.dk, linux-kernel@vger.kernel.org
Subject: Re: workqueue and pending
Date: Mon, 3 May 2004 20:16:16 -0700 [thread overview]
Message-ID: <20040503201616.6f3b8700.akpm@osdl.org> (raw)
In-Reply-To: <1083639081.20092.294.camel@gaston>
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
>
> >
> > @@ -75,8 +76,11 @@ extern void init_workqueues(void);
> > */
> > static inline int cancel_delayed_work(struct work_struct *work)
> > {
> > - return del_timer_sync(&work->timer);
> > + int ret;
> > +
> > + ret = del_timer_sync(&work->timer);
> > + clear_bit(0, &work->pending);
> > + return ret;
> > }
> >
>
> Looks wrong to me. The time may have fired already and queued the
> work. Clearing pending is an error in this case since the work is
> indeed pending for execution....
OK...
--- 25/include/linux/workqueue.h~cancel_delayed_work-fix 2004-05-03 20:14:26.796321416 -0700
+++ 25-akpm/include/linux/workqueue.h 2004-05-03 20:15:41.010039216 -0700
@@ -7,6 +7,7 @@
#include <linux/timer.h>
#include <linux/linkage.h>
+#include <linux/bitops.h>
struct workqueue_struct;
@@ -75,8 +76,12 @@ extern void init_workqueues(void);
*/
static inline int cancel_delayed_work(struct work_struct *work)
{
- return del_timer_sync(&work->timer);
+ int ret;
+
+ ret = del_timer_sync(&work->timer);
+ if (ret)
+ clear_bit(0, &work->pending);
+ return ret;
}
#endif
-
_
next prev parent reply other threads:[~2004-05-04 3:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-03 11:39 Mikkel Christiansen
2004-05-03 23:27 ` Andrew Morton
2004-05-04 2:51 ` Benjamin Herrenschmidt
2004-05-04 3:16 ` Andrew Morton [this message]
2004-05-04 3:55 ` Benjamin Herrenschmidt
2004-05-04 4:15 ` Andrew Morton
2004-05-04 4:41 ` Benjamin Herrenschmidt
2004-05-04 13:36 ` Mikkel Christiansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040503201616.6f3b8700.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mixxel@cs.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®