Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d652330 authored by Al Viro's avatar Al Viro
Browse files

net/socket.c: fold do_sock_{read,write} into callers 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1d10eb2f

net/socket.c

+21 −35
Original line number Diff line number Diff line
@@ -845,25 +845,11 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, 
	return sock->ops->splice_read(sock, ppos, pipe, len, flags);

}



static ssize_t do_sock_read(struct msghdr *msg, struct kiocb *iocb,

		struct file *file, const struct iovec *iov,

		unsigned long nr_segs)

{

	struct socket *sock = file->private_data;



	msg->msg_name = NULL;

	msg->msg_namelen = 0;

	msg->msg_control = NULL;

	msg->msg_controllen = 0;

	iov_iter_init(&msg->msg_iter, READ, iov, nr_segs, iocb->ki_nbytes);

	msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;



	return __sock_recvmsg(iocb, sock, msg, iocb->ki_nbytes, msg->msg_flags);

}



static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,

				unsigned long nr_segs, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	struct socket *sock = file->private_data;

	struct msghdr msg;



	if (pos != 0)
@@ -872,36 +858,36 @@ static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, 
	if (iocb->ki_nbytes == 0)	/* Match SYS5 behaviour */

		return 0;



	return do_sock_read(&msg, iocb, iocb->ki_filp, iov, nr_segs);

}



static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb,

			struct file *file, const struct iovec *iov,

			unsigned long nr_segs)

{

	struct socket *sock = file->private_data;



	msg->msg_name = NULL;

	msg->msg_namelen = 0;

	msg->msg_control = NULL;

	msg->msg_controllen = 0;

	iov_iter_init(&msg->msg_iter, WRITE, iov, nr_segs, iocb->ki_nbytes);

	msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;

	if (sock->type == SOCK_SEQPACKET)

		msg->msg_flags |= MSG_EOR;

	msg.msg_name = NULL;

	msg.msg_namelen = 0;

	msg.msg_control = NULL;

	msg.msg_controllen = 0;

	iov_iter_init(&msg.msg_iter, READ, iov, nr_segs, iocb->ki_nbytes);

	msg.msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;



	return __sock_sendmsg(iocb, sock, msg, iocb->ki_nbytes);

	return __sock_recvmsg(iocb, sock, &msg, iocb->ki_nbytes, msg.msg_flags);

}



static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,

			  unsigned long nr_segs, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	struct socket *sock = file->private_data;

	struct msghdr msg;



	if (pos != 0)

		return -ESPIPE;



	return do_sock_write(&msg, iocb, iocb->ki_filp, iov, nr_segs);

	msg.msg_name = NULL;

	msg.msg_namelen = 0;

	msg.msg_control = NULL;

	msg.msg_controllen = 0;

	iov_iter_init(&msg.msg_iter, WRITE, iov, nr_segs, iocb->ki_nbytes);

	msg.msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;

	if (sock->type == SOCK_SEQPACKET)

		msg.msg_flags |= MSG_EOR;



	return __sock_sendmsg(iocb, sock, &msg, iocb->ki_nbytes);

}



/*