summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-09-21 01:52:42 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2017-12-03 02:37:47 +0100
commitc8c7840ea9459d602d6cb76ddcb166840fc4ba1f (patch)
tree7a46a12bf4140f942286a7b88dfa2a261e83a687 /fs
parentsvc_recvfrom(): switch to sock_recvmsg() (diff)
downloadlinux-c8c7840ea9459d602d6cb76ddcb166840fc4ba1f.tar.xz
linux-c8c7840ea9459d602d6cb76ddcb166840fc4ba1f.zip
dlm: switch to sock_recvmsg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/dlm/lowcomms.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 05707850f93a..cff79ea0c01d 100644
--- 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)