diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2002-11-20 22:45:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-20 22:45:18 -0800 |
| commit | cd22c8c928adcb55bbc12fc0fd8c7c15105ebbbf (patch) | |
| tree | 6effb01e94a3d8902e9830db7f00dc68746cee87 | |
| parent | e063af97d47e667a203f5186d4cd2f3510cc550c (diff) | |
[PATCH] Only set dest addr in NFS/udp reply, not NFS/tcp.
We don't need to send an empty message to
set up remote address when sending tcp reply, so
we don't. Also, as the data is empty, we don't
need to set_fs.
| -rw-r--r-- | net/sunrpc/svcsock.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index e03617f7aa08..6f8baa172f9c 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -324,10 +324,8 @@ svc_wake_up(struct svc_serv *serv) static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr) { - mm_segment_t oldfs; struct svc_sock *svsk = rqstp->rq_sock; struct socket *sock = svsk->sk_sock; - struct msghdr msg; int slen; int len = 0; int result; @@ -339,23 +337,23 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr) slen = xdr->len; - msg.msg_name = &rqstp->rq_addr; - msg.msg_namelen = sizeof(rqstp->rq_addr); - msg.msg_iov = NULL; - msg.msg_iovlen = 0; - msg.msg_control = NULL; - msg.msg_controllen = 0; - msg.msg_flags = MSG_MORE; - /* Grab svsk->sk_sem to serialize outgoing data. */ down(&svsk->sk_sem); - /* set the destination */ - oldfs = get_fs(); set_fs(KERNEL_DS); - len = sock_sendmsg(sock, &msg, 0); - set_fs(oldfs); - if (len < 0) - goto out; + if (rqstp->rq_prot == IPPROTO_UDP) { + /* set the destination */ + struct msghdr msg; + msg.msg_name = &rqstp->rq_addr; + msg.msg_namelen = sizeof(rqstp->rq_addr); + msg.msg_iov = NULL; + msg.msg_iovlen = 0; + msg.msg_control = NULL; + msg.msg_controllen = 0; + msg.msg_flags = MSG_MORE; + + if (sock_sendmsg(sock, &msg, 0) < 0) + goto out; + } /* send head */ if (slen == xdr->head[0].iov_len) |