drbd: don't open-code kernel_recvmsg() (f730c848) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/block/drbd/drbd_receiver.c

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -468,24 +468,14 @@ static void drbd_wait_ee_list_empty(struct drbd_conf *mdev,

	static int drbd_recv_short(struct socket sock, void buf, size_t size, int flags)		static int drbd_recv_short(struct socket sock, void buf, size_t size, int flags)
	{		{
	mm_segment_t oldfs;
	struct kvec iov = {		struct kvec iov = {
	.iov_base = buf,		.iov_base = buf,
	.iov_len = size,		.iov_len = size,
	};		};
	struct msghdr msg = {		struct msghdr msg = {
	.msg_iovlen = 1,
	.msg_iov = (struct iovec *)&iov,
	.msg_flags = (flags ? flags : MSG_WAITALL \| MSG_NOSIGNAL)		.msg_flags = (flags ? flags : MSG_WAITALL \| MSG_NOSIGNAL)
	};		};
	int rv;		return kernel_recvmsg(sock, &msg, &iov, 1, size, msg.msg_flags);

	oldfs = get_fs();
	set_fs(KERNEL_DS);
	rv = sock_recvmsg(sock, &msg, size, msg.msg_flags);
	set_fs(oldfs);

	return rv;
	}		}

	static int drbd_recv(struct drbd_tconn tconn, void buf, size_t size)		static int drbd_recv(struct drbd_tconn tconn, void buf, size_t size)