projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e4ed1b
)
dlm: switch to sock_recvmsg()
author
Al Viro
<viro@zeniv.linux.org.uk>
Wed, 20 Sep 2017 23:52:42 +0000
(19:52 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 3 Dec 2017 01:37:47 +0000
(20:37 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/dlm/lowcomms.c
patch
|
blob
|
history
diff --git
a/fs/dlm/lowcomms.c
b/fs/dlm/lowcomms.c
index
0570785
..
cff79ea
100644
(file)
--- a/
fs/dlm/lowcomms.c
+++ b/
fs/dlm/lowcomms.c
@@
-675,9
+675,9
@@
static int receive_from_sock(struct connection *con)
nvec = 2;
}
len = iov[0].iov_len + iov[1].iov_len;
+ iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, iov, nvec, len);
- r = ret = kernel_recvmsg(con->sock, &msg, iov, nvec, len,
- MSG_DONTWAIT | MSG_NOSIGNAL);
+ r = ret = sock_recvmsg(con->sock, &msg, MSG_DONTWAIT | MSG_NOSIGNAL);
if (ret <= 0)
goto out_close;
else if (ret == len)