From: Jeff Layton <jlayton@redhat.com>
To: trond.myklebust@primarydata.com, Anna.Schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v2 04/10] nfs: use safe, interruptible sleeps when waiting to retry LOCK
Date: Fri, 9 Sep 2016 14:47:45 -0400 [thread overview]
Message-ID: <1473446870-1831-5-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1473446870-1831-1-git-send-email-jlayton@redhat.com>
We actually want to use TASK_INTERRUPTIBLE sleeps when we're in the
process of polling for a NFSv4 lock. If there is a signal pending when
the task wakes up, then we'll be returning an error anyway. So, we might
as well wake up immediately for non-fatal signals as well. That allows
us to return to userland more quickly in that case, but won't change the
error that userland sees.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/nfs/nfs4proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index e3bf95369daf..90e8ded0ef82 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5537,7 +5537,7 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4
static unsigned long
nfs4_set_lock_task_retry(unsigned long timeout)
{
- freezable_schedule_timeout_killable_unsafe(timeout);
+ freezable_schedule_timeout_interruptible(timeout);
timeout <<= 1;
if (timeout > NFS4_LOCK_MAXTIMEOUT)
return NFS4_LOCK_MAXTIMEOUT;
--
2.7.4
next prev parent reply other threads:[~2016-09-09 18:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 18:47 [PATCH v2 00/10] nfs: add CB_NOTIFY_LOCK support to nfs client Jeff Layton
2016-09-09 18:47 ` [PATCH v2 01/10] nfs: the length argument to read_buf should be unsigned Jeff Layton
2016-09-09 18:47 ` [PATCH v2 02/10] nfs: eliminate pointless and confusing do_vfs_lock wrappers Jeff Layton
2016-09-09 18:47 ` [PATCH v2 03/10] nfs: check for POSIX lock capability on server even for flock locks Jeff Layton
2016-09-09 18:47 ` Jeff Layton [this message]
2016-09-09 18:47 ` [PATCH v2 05/10] nfs: track whether server sets MAY_NOTIFY_LOCK flag Jeff Layton
2016-09-12 20:19 ` Anna Schumaker
2016-09-12 20:30 ` Jeff Layton
2016-09-12 20:38 ` Anna Schumaker
2016-09-09 18:47 ` [PATCH v2 06/10] nfs: add handling for CB_NOTIFY_LOCK in client Jeff Layton
2016-09-09 18:47 ` [PATCH v2 07/10] nfs: move nfs4_set_lock_state call into caller Jeff Layton
2016-09-09 18:47 ` [PATCH v2 08/10] nfs: move nfs4 lock retry attempt loop to a separate function Jeff Layton
2016-09-09 18:47 ` [PATCH v2 09/10] nfs: add code to allow client to wait on lock callbacks Jeff Layton
2016-09-09 18:48 ` [PATCH v2 10/10] nfs: ensure that the filehandle in CB_NOTIFY_LOCK request matches the inode 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=1473446870-1831-5-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=Anna.Schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.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).