From: Oleg Nesterov <oleg@redhat.com>
To: Tejun Heo <tj@kernel.org>, Jeff Layton <jlayton@redhat.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
Steve French <sfrench@samba.org>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
linux-cifs@vger.kernel.org,
"J. Bruce Fields" <bfields@fieldses.org>,
Neil Brown <neilb@suse.de>,
trond.myklebust@netapp.com, linux-nfs@vger.kernel.org
Subject: [PATCH] wait_event_freezekillable: use freezer_do_not_count/freezer_count
Date: Wed, 2 Nov 2011 18:53:27 +0100 [thread overview]
Message-ID: <20111102175327.GA4446@redhat.com> (raw)
In-Reply-To: <20111101215710.GA13803@google.com>
fake_signal_wake_up() should not wake up the TASK_KILLABLE tasks,
we are going to fix this. This means that wait_event_freezekillable()
can't rely on wakeup from freezer. Reimplement it using
freezer_do_not_count/freezer_count. This is not really nice, just
a simple fix for now.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
include/linux/freezer.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -143,13 +143,9 @@ static inline void set_freezable_with_si
#define wait_event_freezekillable(wq, condition) \
({ \
int __retval; \
- for (;;) { \
- __retval = wait_event_killable(wq, \
- (condition) || freezing(current)); \
- if (__retval || (condition)) \
- break; \
- try_to_freeze(); \
- } \
+ freezer_do_not_count(); \
+ __retval = wait_event_killable(wq, (condition)); \
+ freezer_count(); \
__retval; \
})
next prev parent reply other threads:[~2011-11-02 17:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20111031221743.GA18855@google.com>
[not found] ` <201111010024.16659.rjw@sisk.pl>
[not found] ` <20111031233059.GI18855@google.com>
[not found] ` <20111101005505.GO18855@google.com>
2011-11-01 8:13 ` [RFC PATCH] freezer: revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too" Jeff Layton
2011-11-01 10:59 ` Jeff Layton
2011-11-01 16:30 ` Tejun Heo
2011-11-01 16:49 ` Trond Myklebust
2011-11-01 16:55 ` Tejun Heo
2011-11-01 17:59 ` Oleg Nesterov
2011-11-01 18:06 ` Tejun Heo
2011-11-01 18:13 ` Oleg Nesterov
2011-11-01 18:27 ` Tejun Heo
2011-11-01 19:39 ` Oleg Nesterov
2011-11-01 19:46 ` Oleg Nesterov
2011-11-01 21:57 ` Tejun Heo
2011-11-02 11:42 ` Jeff Layton
2011-11-02 15:13 ` Oleg Nesterov
2011-11-02 16:23 ` Oleg Nesterov
2011-11-02 23:11 ` Rafael J. Wysocki
2011-11-03 11:15 ` Jeff Layton
2011-11-03 15:10 ` Oleg Nesterov
2011-11-02 17:53 ` Oleg Nesterov [this message]
2011-11-03 10:42 ` [PATCH] wait_event_freezekillable: use freezer_do_not_count/freezer_count Jeff Layton
2011-11-03 14:13 ` Tejun Heo
2011-11-03 15:27 ` Jeff Layton
2011-11-03 15:30 ` Tejun Heo
2011-11-01 18:26 ` [RFC PATCH] freezer: revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too" Jeff Layton
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=20111102175327.GA4446@redhat.com \
--to=oleg@redhat.com \
--cc=bfields@fieldses.org \
--cc=jlayton@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=neilb@suse.de \
--cc=rjw@sisk.pl \
--cc=sfrench@samba.org \
--cc=tj@kernel.org \
--cc=trond.myklebust@netapp.com \
/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;
as well as URLs for NNTP newsgroup(s).