Merge tag 'nfsd-5.5' of git://linux-nfs.org/~bfields/linux

[linux-2.6-microblaze.git] / net / sunrpc / xprtsock.c

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 70e52f5..d86c664 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1752,7 +1752,7 @@ static void xs_set_port(struct rpc_xprt *xprt, unsigned short port)
 
 static void xs_set_srcport(struct sock_xprt *transport, struct socket *sock)
 {
-       if (transport->srcport == 0)
+       if (transport->srcport == 0 && transport->xprt.reuseport)
                transport->srcport = xs_sock_getport(sock);
 }
 
@@ -2659,6 +2659,8 @@ static int bc_sendto(struct rpc_rqst *req)
                .iov_len        = sizeof(marker),
        };
 
+       req->rq_xtime = ktime_get();
+
        len = kernel_sendmsg(transport->sock, &msg, &iov, 1, iov.iov_len);
        if (len != iov.iov_len)
                return -EAGAIN;
@@ -2684,7 +2686,6 @@ static int bc_send_request(struct rpc_rqst *req)
        struct svc_xprt *xprt;
        int len;
 
-       dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
        /*
         * Get the server socket associated with this callback xprt
         */