projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
956a27e
)
ipvs: switch to sock_recvmsg()
author
Al Viro
<viro@zeniv.linux.org.uk>
Thu, 21 Sep 2017 00:14:51 +0000
(20:14 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 3 Dec 2017 01:38:08 +0000
(20:38 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
net/netfilter/ipvs/ip_vs_sync.c
patch
|
blob
|
blame
|
history
diff --git
a/net/netfilter/ipvs/ip_vs_sync.c
b/net/netfilter/ipvs/ip_vs_sync.c
index 9ee71cb276d734795e16719347fbf2740ce0cfc4..fbaf3bd05b2ec9051734849cf1ab0fdf15dea386 100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_sync.c
+++ b/
net/netfilter/ipvs/ip_vs_sync.c
@@
-1636,17
+1636,14
@@
static int
ip_vs_receive(struct socket *sock, char *buffer, const size_t buflen)
{
struct msghdr msg = {NULL,};
- struct kvec iov;
+ struct kvec iov
= {buffer, buflen}
;
int len;
EnterFunction(7);
/* Receive a packet */
- iov.iov_base = buffer;
- iov.iov_len = (size_t)buflen;
-
- len = kernel_recvmsg(sock, &msg, &iov, 1, buflen, MSG_DONTWAIT);
-
+ iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &iov, 1, buflen);
+ len = sock_recvmsg(sock, &msg, MSG_DONTWAIT);
if (len < 0)
return len;