From: Jeff Layton <jlayton@redhat.com>
To: trond.myklebust@primarydata.com, anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org, bfields@fieldses.org
Subject: [PATCH v4 3/9] nfs: use safe, interruptible sleeps when waiting to retry LOCK
Date: Sat, 17 Sep 2016 18:17:33 -0400 [thread overview]
Message-ID: <1474150659-23894-4-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1474150659-23894-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.
Also, there is no need to use the *_unsafe sleep variants here, as no
vfs-layer locks should be held at this point.
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 9d38366666f4..73b2c883558e 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-17 22:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-17 22:17 [PATCH v4 0/9] nfs: add CB_NOTIFY_LOCK support to nfs client Jeff Layton
2016-09-17 22:17 ` [PATCH v4 1/9] nfs: the length argument to read_buf should be unsigned Jeff Layton
2016-09-17 22:17 ` [PATCH v4 2/9] nfs: eliminate pointless and confusing do_vfs_lock wrappers Jeff Layton
2016-09-17 22:17 ` Jeff Layton [this message]
2016-09-17 22:17 ` [PATCH v4 4/9] nfs: add a new NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK constant Jeff Layton
2016-09-17 22:17 ` [PATCH v4 5/9] nfs: track whether server sets MAY_NOTIFY_LOCK flag Jeff Layton
2016-09-17 22:17 ` [PATCH v4 6/9] nfs: add handling for CB_NOTIFY_LOCK in client Jeff Layton
2016-09-17 22:17 ` [PATCH v4 7/9] nfs: move nfs4_set_lock_state call into caller Jeff Layton
2016-09-17 22:17 ` [PATCH v4 8/9] nfs: move nfs4 lock retry attempt loop to a separate function Jeff Layton
2016-09-17 22:17 ` [PATCH v4 9/9] nfs: allow blocking locks to be awoken by lock callbacks Jeff Layton
2016-09-19 17:22 ` 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=1474150659-23894-4-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.