diff options
| author | Al Viro | 2017-09-21 01:56:52 +0200 |
|---|---|---|
| committer | Al Viro | 2017-12-03 02:38:04 +0100 |
| commit | e749d4facf24190ab1549886f69ab16880f5d234 (patch) | |
| tree | 6bb5d692fb1c0c2b474653331fe14bb90913db2b /fs/ocfs2/cluster | |
| parent | ncpfs: switch to sock_recvmsg() (diff) | |
| download | kernel-qcow2-linux-e749d4facf24190ab1549886f69ab16880f5d234.tar.gz kernel-qcow2-linux-e749d4facf24190ab1549886f69ab16880f5d234.tar.xz kernel-qcow2-linux-e749d4facf24190ab1549886f69ab16880f5d234.zip | |
cfs2: switch to sock_recvmsg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2/cluster')
| -rw-r--r-- | fs/ocfs2/cluster/tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index bebe59feca58..eac5140aac47 100644 --- 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, |