1 files changed, 12 insertions, 8 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 71d9599b5816..d7ec6132c046 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1739,14 +1739,10 @@ rpc_xdr_encode(struct rpc_task *task)
         xdr_buf_init(&req->rq_rcv_buf,
                      req->rq_rbuffer,
                      req->rq_rcvsize);
-        req->rq_bytes_sent = 0;
 
         p = rpc_encode_header(task);
-        if (p == NULL) {
-                printk(KERN_INFO "RPC: couldn't encode RPC header, exit EIO\n");
-                rpc_exit(task, -EIO);
+        if (p == NULL)
                 return;
-        }
 
         encode = task->tk_msg.rpc_proc->p_encode;
         if (encode == NULL)
@@ -1771,10 +1767,17 @@ call_encode(struct rpc_task *task)
         /* Did the encode result in an error condition? */
         if (task->tk_status != 0) {
                 /* Was the error nonfatal? */
-                if (task->tk_status == -EAGAIN || task->tk_status == -ENOMEM)
+                switch (task->tk_status) {
+                case -EAGAIN:
+                case -ENOMEM:
                         rpc_delay(task, HZ >> 4);
-                else
+                        break;
+                case -EKEYEXPIRED:
+                        task->tk_action = call_refresh;
+                        break;
+                default:
                         rpc_exit(task, task->tk_status);
+                }
                 return;
         }
 
@@ -2336,7 +2339,8 @@ rpc_encode_header(struct rpc_task *task)
         *p++ = htonl(clnt->cl_vers);    /* program version */
         *p++ = htonl(task->tk_msg.rpc_proc->p_proc);    /* procedure */
         p = rpcauth_marshcred(task, p);
-        req->rq_slen = xdr_adjust_iovec(&req->rq_svec[0], p);
+        if (p)
+                req->rq_slen = xdr_adjust_iovec(&req->rq_svec[0], p);
         return p;
 }