Merge tag 'nfs-rdma-4.8-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma

NFS: NFSoRDMA Client Side Changes

New Features:
- Add kerberos support

Bugfixes and cleanups:
- Remove ALLPHYSICAL memory registration mode
- Fix FMR disconnect recovery
- Reduce memory usage

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index cc9852897395..c5b0cb4f4056 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1188,11 +1188,17 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
                 *statp = procp->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);
 
                 /* Encode reply */
-                if (test_bit(RQ_DROPME, &rqstp->rq_flags)) {
+                if (*statp == rpc_drop_reply ||
+                    test_bit(RQ_DROPME, &rqstp->rq_flags)) {
                         if (procp->pc_release)
                                 procp->pc_release(rqstp, NULL, rqstp->rq_resp);
                         goto dropit;
                 }
+                if (*statp == rpc_autherr_badcred) {
+                        if (procp->pc_release)
+                                procp->pc_release(rqstp, NULL, rqstp->rq_resp);
+                        goto err_bad_auth;
+                }
                 if (*statp == rpc_success &&
                     (xdr = procp->pc_encode) &&
                     !xdr(rqstp, resv->iov_base+resv->iov_len, rqstp->rq_resp)) {