linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@redhat.com>
To: trond.myklebust@netapp.com, smfrench@gmail.com, pavel@ucw.cz,
	rjw@sisk.pl
Cc: linux-pm@lists.linux-foundation.org, linux-cifs@vger.kernel.org,
	linux-nfs@vger.kernel.org, john@Calva.COM,
	linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] sunrpc: make rpc_wait_bit_killable handle freeze events
Date: Wed, 28 Sep 2011 07:52:40 -0400	[thread overview]
Message-ID: <1317210761-11518-4-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1317210761-11518-1-git-send-email-jlayton@redhat.com>

Allow the wait_on_bit_killable sleeps in SUNRPC layer to respect the
freezer. This should allow suspend and hibernate events to occur, even
when there are RPC's pending on the wire.

Tested-by: John Hughes <john@Calva.COM>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 net/sunrpc/sched.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index d12ffa5..09bb64e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -18,6 +18,7 @@
 #include <linux/smp.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 #include <linux/sunrpc/clnt.h>
 
@@ -231,7 +232,8 @@ static int rpc_wait_bit_killable(void *word)
 {
 	if (fatal_signal_pending(current))
 		return -ERESTARTSYS;
-	schedule();
+	if (!try_to_freeze())
+		schedule();
 	return 0;
 }
 
-- 
1.7.6.2


  parent reply	other threads:[~2011-09-28 11:52 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28 11:52 [PATCH 0/4] allow freezing of tasks with netfs calls in flight Jeff Layton
2011-09-28 11:52 ` [PATCH 1/4] freezer: make fake_signal_wake_up wake TASK_KILLABLE tasks too Jeff Layton
2011-10-11  6:18   ` Pavel Machek
2011-10-11 10:10     ` Jeff Layton
2011-10-11 19:14       ` Rafael J. Wysocki
2011-10-26 19:55         ` Jeff Layton
2011-10-27 20:21           ` Rafael J. Wysocki
2011-10-27 20:22             ` [linux-pm] " Rafael J. Wysocki
2011-10-27 20:26               ` Steve French
2011-09-28 11:52 ` [PATCH 2/4] cifs, freezer: add wait_event_freezekillable and have cifs use it Jeff Layton
2011-09-29  4:28   ` Steve French
2011-09-29 10:41     ` Jeff Layton
2011-09-29 16:39       ` Steve French
2011-09-29 17:29         ` Jeff Layton
2011-09-28 11:52 ` Jeff Layton [this message]
2011-10-11  6:19   ` [PATCH 3/4] sunrpc: make rpc_wait_bit_killable handle freeze events Pavel Machek
2011-10-11 10:12     ` Jeff Layton
2011-10-11 12:52       ` Myklebust, Trond
2011-10-11 13:14         ` Jeff Layton
2011-09-28 11:52 ` [PATCH 4/4] nfs: make TASK_KILLABLE sleeps attempt to freeze Jeff Layton
2011-10-19 15:18   ` [PATCH 4/4] nfs: make TASK_KILLABLE sleeps attempt to freeze (try #2) Jeff Layton
2011-10-11  6:18 ` [PATCH 0/4] allow freezing of tasks with netfs calls in flight Pavel Machek
2011-10-11 10:05   ` Jeff Layton
2011-10-11 19:19     ` Rafael J. Wysocki

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=1317210761-11518-4-git-send-email-jlayton@redhat.com \
    --to=jlayton@redhat.com \
    --cc=john@Calva.COM \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=pavel@ucw.cz \
    --cc=rjw@sisk.pl \
    --cc=smfrench@gmail.com \
    --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).