From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-vw0-f46.google.com ([209.85.212.46]:56032 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755163Ab1J1GIk (ORCPT ); Fri, 28 Oct 2011 02:08:40 -0400 From: Jeff Layton To: rjw@sisk.pl Cc: trond.myklebust@netapp.com, linux-pm@lists.linux-foundation.org, linux-nfs@vger.kernel.org, john@calva.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] nfs: make TASK_KILLABLE sleeps attempt to freeze Date: Fri, 28 Oct 2011 02:08:32 -0400 Message-Id: <1319782112-15094-2-git-send-email-jlayton@redhat.com> In-Reply-To: <1319782112-15094-1-git-send-email-jlayton@redhat.com> References: <1319782112-15094-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Allow the TASK_KILLABLE sleeps in NFS layer to respect the freezer. This should allow suspend and hibernate events to occur, even when the client is looping on an EJUKEBOX or NFS4ERR_DELAY sort of error. Tested-by: John Hughes Acked-by: Trond Myklebust Signed-off-by: Jeff Layton --- fs/nfs/inode.c | 4 +++- fs/nfs/nfs3proc.c | 4 +++- fs/nfs/nfs4proc.c | 13 +++++++++---- fs/nfs/proc.c | 4 +++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 4dc6d07..4b91e24 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -77,7 +78,8 @@ int nfs_wait_bit_killable(void *word) { if (fatal_signal_pending(current)) return -ERESTARTSYS; - schedule(); + if (!try_to_freeze()) + schedule(); return 0; } diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 85f1690..5354219 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "iostat.h" #include "internal.h" @@ -32,7 +33,8 @@ nfs3_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags) res = rpc_call_sync(clnt, msg, flags); if (res != -EJUKEBOX && res != -EKEYEXPIRED) break; - schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME); + if (!try_to_freeze()) + schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME); res = -ERESTARTSYS; } while (!fatal_signal_pending(current)); return res; diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d2ae413..085eb8a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -53,6 +53,7 @@ #include #include #include +#include #include "nfs4_fs.h" #include "delegation.h" @@ -241,10 +242,12 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout) *timeout = NFS4_POLL_RETRY_MIN; if (*timeout > NFS4_POLL_RETRY_MAX) *timeout = NFS4_POLL_RETRY_MAX; - schedule_timeout_killable(*timeout); + if (!try_to_freeze()) { + schedule_timeout_killable(*timeout); + *timeout <<= 1; + } if (fatal_signal_pending(current)) res = -ERESTARTSYS; - *timeout <<= 1; return res; } @@ -3951,8 +3954,10 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4 static unsigned long nfs4_set_lock_task_retry(unsigned long timeout) { - schedule_timeout_killable(timeout); - timeout <<= 1; + if (!try_to_freeze()) { + schedule_timeout_killable(timeout); + timeout <<= 1; + } if (timeout > NFS4_LOCK_MAXTIMEOUT) return NFS4_LOCK_MAXTIMEOUT; return timeout; diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index ac40b85..0b70e85 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "internal.h" #define NFSDBG_FACILITY NFSDBG_PROC @@ -59,7 +60,8 @@ nfs_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags) res = rpc_call_sync(clnt, msg, flags); if (res != -EKEYEXPIRED) break; - schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME); + if (!try_to_freeze()) + schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME); res = -ERESTARTSYS; } while (!fatal_signal_pending(current)); return res; -- 1.7.6.4