diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-09 21:12:37 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-26 21:37:37 -0500 |
| commit | 4b4fbad37f70f1dca26e060cf8dc71371b01899c (patch) | |
| tree | 73da27fe0f4fee42acef1a585df23e5720560be0 | |
| parent | b4b8664d291ac1998e0f0bcdc96b6397f0fe68b3 (diff) | |
| download | lwn-4b4fbad37f70f1dca26e060cf8dc71371b01899c.tar.gz lwn-4b4fbad37f70f1dca26e060cf8dc71371b01899c.zip | |
ncpfs: sendmsg does *not* bugger iovec these days
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/ncpfs/sock.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index f32f272ee501..97cfccefccc5 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c @@ -205,10 +205,7 @@ static inline void __ncptcp_abort(struct ncp_server *server) static int ncpdgram_send(struct socket *sock, struct ncp_request_reply *req) { - struct kvec vec[3]; - /* sock_sendmsg updates iov pointers for us :-( */ - memcpy(vec, req->tx_ciov, req->tx_iovlen * sizeof(vec[0])); - return do_send(sock, vec, req->tx_iovlen, + return do_send(sock, req->tx_ciov, req->tx_iovlen, req->tx_totallen, MSG_DONTWAIT); } @@ -216,16 +213,13 @@ static void __ncptcp_try_send(struct ncp_server *server) { struct ncp_request_reply *rq; struct kvec *iov; - struct kvec iovc[3]; int result; rq = server->tx.creq; if (!rq) return; - /* sock_sendmsg updates iov pointers for us :-( */ - memcpy(iovc, rq->tx_ciov, rq->tx_iovlen * sizeof(iov[0])); - result = do_send(server->ncp_sock, iovc, rq->tx_iovlen, + result = do_send(server->ncp_sock, rq->tx_ciov, rq->tx_iovlen, rq->tx_totallen, MSG_NOSIGNAL | MSG_DONTWAIT); if (result == -EAGAIN) |