diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index d21b51f5..18818269 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -158,15 +158,6 @@ ifneq (,$(shell grep 'sock_create_kern.*struct net' include/linux/net.h)) ccflags-y += -DKC_SOCK_CREATE_KERN_NET=1 endif -# -# v3.18-rc6-1619-gc0371da6047a -# -# iov_iter is now part of struct msghdr -# -ifneq (,$(shell grep 'struct iov_iter.*msg_iter' include/linux/socket.h)) -ccflags-y += -DKC_MSGHDR_STRUCT_IOV_ITER=1 -endif - # # v4.17-rc6-7-g95582b008388 # diff --git a/kmod/src/net.c b/kmod/src/net.c index bed092ad..380ee637 100644 --- a/kmod/src/net.c +++ b/kmod/src/net.c @@ -598,12 +598,6 @@ static int k_recvmsg(struct socket *sock, void *buf, unsigned len) .msg_flags = MSG_NOSIGNAL, }; -#ifndef KC_MSGHDR_STRUCT_IOV_ITER - msg.msg_iov = (struct iovec *)&kv; - msg.msg_iovlen = 1; -#else - iov_iter_init(&msg.msg_iter, READ, (struct iovec *)&kv, len, 1); -#endif return kernel_recvmsg(sock, &msg, &kv, 1, len, msg.msg_flags); } diff --git a/kmod/src/quorum.c b/kmod/src/quorum.c index 1220d3bb..7c385448 100644 --- a/kmod/src/quorum.c +++ b/kmod/src/quorum.c @@ -243,10 +243,6 @@ static int send_msg_members(struct super_block *sb, int type, u64 term, int only }; struct sockaddr_in sin; struct msghdr mh = { -#ifndef KC_MSGHDR_STRUCT_IOV_ITER - .msg_iov = (struct iovec *)&kv, - .msg_iovlen = 1, -#endif .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL, .msg_name = &sin, .msg_namelen = sizeof(sin), @@ -268,9 +264,7 @@ static int send_msg_members(struct super_block *sb, int type, u64 term, int only scoutfs_quorum_slot_sin(&qinf->qconf, i, &sin); now = ktime_get(); -#ifdef KC_MSGHDR_STRUCT_IOV_ITER - iov_iter_init(&mh.msg_iter, WRITE, (struct iovec *)&kv, 1, sizeof(qmes)); -#endif + ret = kernel_sendmsg(qinf->sock, &mh, &kv, 1, kv.iov_len); if (ret != kv.iov_len) failed++; @@ -312,10 +306,6 @@ static int recv_msg(struct super_block *sb, struct quorum_host_msg *msg, .iov_len = sizeof(struct scoutfs_quorum_message), }; struct msghdr mh = { -#ifndef KC_MSGHDR_STRUCT_IOV_ITER - .msg_iov = (struct iovec *)&kv, - .msg_iovlen = 1, -#endif .msg_flags = MSG_NOSIGNAL, }; @@ -333,9 +323,6 @@ static int recv_msg(struct super_block *sb, struct quorum_host_msg *msg, ret = kc_tcp_sock_set_rcvtimeo(qinf->sock, rel_to); } -#ifdef KC_MSGHDR_STRUCT_IOV_ITER - iov_iter_init(&mh.msg_iter, READ, (struct iovec *)&kv, 1, sizeof(struct scoutfs_quorum_message)); -#endif ret = kernel_recvmsg(qinf->sock, &mh, &kv, 1, kv.iov_len, mh.msg_flags); if (ret < 0) return ret;