projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
872f840
)
cfs2: switch to sock_recvmsg()
author
Al Viro
<viro@zeniv.linux.org.uk>
Wed, 20 Sep 2017 23:56:52 +0000
(19:56 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 3 Dec 2017 01:38:04 +0000
(20:38 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/ocfs2/cluster/tcp.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/cluster/tcp.c
b/fs/ocfs2/cluster/tcp.c
index bebe59feca5873a766cd28becd269cc576cdfc6d..eac5140aac47cb8aa6e52de723cff9ed8dbbec3a 100644
(file)
--- a/
fs/ocfs2/cluster/tcp.c
+++ b/
fs/ocfs2/cluster/tcp.c
@@
-918,7
+918,8
@@
static int o2net_recv_tcp_msg(struct socket *sock, void *data, size_t len)
{
struct kvec vec = { .iov_len = len, .iov_base = data, };
struct msghdr msg = { .msg_flags = MSG_DONTWAIT, };
- return kernel_recvmsg(sock, &msg, &vec, 1, len, msg.msg_flags);
+ iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &vec, 1, len);
+ return sock_recvmsg(sock, &msg, MSG_DONTWAIT);
}
static int o2net_send_tcp_msg(struct socket *sock, struct kvec *vec,