niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ncpfs: sendmsg does *not* bugger iovec these days

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-01-09 21:12:37 -05:00
parent b4b8664d29
commit 4b4fbad37f
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/ncpfs/sock.c
View file

@ -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) static int ncpdgram_send(struct socket *sock, struct ncp_request_reply *req)
{ {
struct kvec vec[3]; return do_send(sock, req->tx_ciov, req->tx_iovlen,
/* 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,
req->tx_totallen, MSG_DONTWAIT); req->tx_totallen, MSG_DONTWAIT);
} }
@ -216,16 +213,13 @@ static void __ncptcp_try_send(struct ncp_server *server)
{ {
struct ncp_request_reply *rq; struct ncp_request_reply *rq;
struct kvec *iov; struct kvec *iov;
struct kvec iovc[3];
int result; int result;
rq = server->tx.creq; rq = server->tx.creq;
if (!rq) if (!rq)
return; return;
/* sock_sendmsg updates iov pointers for us :-( */ result = do_send(server->ncp_sock, rq->tx_ciov, rq->tx_iovlen,
memcpy(iovc, rq->tx_ciov, rq->tx_iovlen * sizeof(iov[0]));
result = do_send(server->ncp_sock, iovc, rq->tx_iovlen,
rq->tx_totallen, MSG_NOSIGNAL | MSG_DONTWAIT); rq->tx_totallen, MSG_NOSIGNAL | MSG_DONTWAIT);
if (result == -EAGAIN) if (result == -EAGAIN)