From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Trond Myklebust <Trond.Myklebust@netapp.com>
Subject: [PATCH 3.4 11/25] NFSv4: Update list of irrecoverable errors on DELEGRETURN
Date: Tue, 10 Dec 2013 00:00:19 -0800 [thread overview]
Message-ID: <20131210075931.627844494@linuxfoundation.org> (raw)
In-Reply-To: <20131210075930.808460227@linuxfoundation.org>
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <Trond.Myklebust@netapp.com>
commit c97cf606e43b85a6cf158b810375dd77312024db upstream.
If the DELEGRETURN errors out with something like NFS4ERR_BAD_STATEID
then there is no recovery possible. Just quit without returning an error.
Also, note that the client must not assume that the NFSv4 lease has been
renewed when it sees an error on DELEGRETURN.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/nfs/nfs4proc.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4041,11 +4041,17 @@ static void nfs4_delegreturn_done(struct
return;
switch (task->tk_status) {
- case -NFS4ERR_STALE_STATEID:
- case -NFS4ERR_EXPIRED:
case 0:
renew_lease(data->res.server, data->timestamp);
break;
+ case -NFS4ERR_ADMIN_REVOKED:
+ case -NFS4ERR_DELEG_REVOKED:
+ case -NFS4ERR_BAD_STATEID:
+ case -NFS4ERR_OLD_STATEID:
+ case -NFS4ERR_STALE_STATEID:
+ case -NFS4ERR_EXPIRED:
+ task->tk_status = 0;
+ break;
default:
if (nfs4_async_handle_error(task, data->res.server, NULL) ==
-EAGAIN) {
next prev parent reply other threads:[~2013-12-10 8:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 8:00 [PATCH 3.4 00/25] 3.4.74-stable review Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 01/25] crypto: scatterwalk - Set the chain pointer indication bit Greg Kroah-Hartman
2013-12-10 14:46 ` Lendacky, Thomas
2013-12-11 2:02 ` Greg Kroah-Hartman
2013-12-11 14:51 ` Tom Lendacky
2013-12-10 8:00 ` [PATCH 3.4 02/25] crypto: ccm - Fix handling of zero plaintext when computing mac Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 03/25] crypto: authenc - Find proper IV address in ablkcipher callback Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 04/25] ASoC: wm8990: Mark the register map as dirty when powering down Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 05/25] ASoC: wm8731: fix dsp mode configuration Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 06/25] SCSI: enclosure: fix WARN_ON in dual path device removing Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 07/25] SCSI: libsas: fix usage of ata_tf_to_fis Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 08/25] SCSI: hpsa: do not discard scsi status on aborted commands Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 09/25] SCSI: hpsa: return 0 from driver probe function on success, not 1 Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 10/25] net: smc91: fix crash regression on the versatile Greg Kroah-Hartman
2013-12-10 8:00 ` Greg Kroah-Hartman [this message]
2013-12-10 8:00 ` [PATCH 3.4 12/25] powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536 Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 13/25] irq: Enable all irqs unconditionally in irq_resume Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 14/25] net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 15/25] Input: allow deselecting serio drivers even without CONFIG_EXPERT Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 16/25] Input: mousedev - allow disabling " Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 17/25] um: add missing declaration of getrlimit() and friends Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 18/25] ahci: Add Device IDs for Intel Lynx Point-LP PCH Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 19/25] ahci: AHCI-mode SATA patch for Intel Avoton DeviceIDs Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 20/25] i2c: i801: SMBus " Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 21/25] USB: pl2303: fixed handling of CS5 setting Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 22/25] USB: mos7840: correct " Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 23/25] USB: spcp8x5: " Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 24/25] USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem Greg Kroah-Hartman
2013-12-10 8:00 ` [PATCH 3.4 25/25] drivers/char/i8k.c: add Dell XPLS L421X Greg Kroah-Hartman
2013-12-10 17:01 ` [PATCH 3.4 00/25] 3.4.74-stable review Guenter Roeck
2013-12-11 1:17 ` Greg Kroah-Hartman
2013-12-11 1:48 ` Shuah Khan
2013-12-11 21:19 ` Satoru Takeuchi
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=20131210075931.627844494@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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).