diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-09-20 19:56:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-12-02 20:38:04 -0500 |
commit | e749d4facf24190ab1549886f69ab16880f5d234 (patch) | |
tree | 6bb5d692fb1c0c2b474653331fe14bb90913db2b | |
parent | 872f8408a71b566c96645c9c2191ef3fe9fb891b (diff) |
cfs2: switch to sock_recvmsg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-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) | |||
918 | { | 918 | { |
919 | struct kvec vec = { .iov_len = len, .iov_base = data, }; | 919 | struct kvec vec = { .iov_len = len, .iov_base = data, }; |
920 | struct msghdr msg = { .msg_flags = MSG_DONTWAIT, }; | 920 | struct msghdr msg = { .msg_flags = MSG_DONTWAIT, }; |
921 | return kernel_recvmsg(sock, &msg, &vec, 1, len, msg.msg_flags); | 921 | iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &vec, 1, len); |
922 | return sock_recvmsg(sock, &msg, MSG_DONTWAIT); | ||
922 | } | 923 | } |
923 | 924 | ||
924 | static int o2net_send_tcp_msg(struct socket *sock, struct kvec *vec, | 925 | static int o2net_send_tcp_msg(struct socket *sock, struct kvec *vec, |