Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

backmerge to do fixup of iov_iter_kvec() conflict

diff --combined net/sunrpc/svcsock.c
index 0b46ec0bf74e8e924be78a43c71421e48eb69eac,db8bb6b3a2b0faf387868b80539c33ae9c5626dd..1c1e52964edbfb3c79c61e82d6527b28ffccd269
--- 1/net/sunrpc/svcsock.c
--- 2/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@@ -338,7 -338,7 +338,7 @@@ static int svc_recvfrom(struct svc_rqs
        rqstp->rq_xprt_hlen = 0;
  
        clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 -      iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, iov, nr, buflen);
 +      iov_iter_kvec(&msg.msg_iter, READ, iov, nr, buflen);
        len = sock_recvmsg(svsk->sk_sock, &msg, msg.msg_flags);
        /* If we read a full record, then assume there may be more
         * data to read (stream based sockets only!)
@@@ -1004,7 -1004,7 +1004,7 @@@ static int receive_cb_reply(struct svc_
  
        if (!bc_xprt)
                return -EAGAIN;
-       spin_lock(&bc_xprt->recv_lock);
+       spin_lock(&bc_xprt->queue_lock);
        req = xprt_lookup_rqst(bc_xprt, xid);
        if (!req)
                goto unlock_notfound;
@@@ -1022,7 -1022,7 +1022,7 @@@
        memcpy(dst->iov_base, src->iov_base, src->iov_len);
        xprt_complete_rqst(req->rq_task, rqstp->rq_arg.len);
        rqstp->rq_arg.len = 0;
-       spin_unlock(&bc_xprt->recv_lock);
+       spin_unlock(&bc_xprt->queue_lock);
        return 0;
  unlock_notfound:
        printk(KERN_NOTICE
@@@ -1031,7 -1031,7 +1031,7 @@@
                __func__, ntohl(calldir),
                bc_xprt, ntohl(xid));
  unlock_eagain:
-       spin_unlock(&bc_xprt->recv_lock);
+       spin_unlock(&bc_xprt->queue_lock);
        return -EAGAIN;
  }