summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2013-08-14 11:59:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 11:11:41 -0800
commit5bad04d7bc7fe12a89b716f8b63d32b5735f6dd2 (patch)
treedabad82a1c00e43e90957489a239ceabbf5c0ef9
parentbcb97394c1d36ec62de59963f5e08cfff61b9c81 (diff)
downloadlwn-5bad04d7bc7fe12a89b716f8b63d32b5735f6dd2.tar.gz
lwn-5bad04d7bc7fe12a89b716f8b63d32b5735f6dd2.zip
SUNRPC: don't map EKEYEXPIRED to EACCES in call_refreshresult
commit f1ff0c27fd9987c59d707cd1a6b6c1fc3ae0a250 upstream. The NFS layer needs to know when a key has expired. This change also returns -EKEYEXPIRED to the application, and the informative "Key has expired" error message is displayed. The user then knows that credential renewal is required. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/sunrpc/clnt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 426f8fcc4c6c..5b1bf7b530f1 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1407,9 +1407,9 @@ call_refreshresult(struct rpc_task *task)
return;
case -ETIMEDOUT:
rpc_delay(task, 3*HZ);
- case -EKEYEXPIRED:
case -EAGAIN:
status = -EACCES;
+ case -EKEYEXPIRED:
if (!task->tk_cred_retry)
break;
task->tk_cred_retry--;