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

Commit 8ae5e030 authored by Al Viro's avatar Al Viro
Browse files

net: switch sockets to ->read_iter/->write_iter 



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

net/socket.c

+27 −29
Original line number Diff line number Diff line
@@ -113,10 +113,8 @@ unsigned int sysctl_net_busy_read __read_mostly; 
unsigned int sysctl_net_busy_poll __read_mostly;

#endif



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

			 unsigned long nr_segs, loff_t pos);

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

			  unsigned long nr_segs, loff_t pos);

static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to);

static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from);

static int sock_mmap(struct file *file, struct vm_area_struct *vma);



static int sock_close(struct inode *inode, struct file *file);
@@ -142,8 +140,10 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, 
static const struct file_operations socket_file_ops = {

	.owner =	THIS_MODULE,

	.llseek =	no_llseek,

	.aio_read =	sock_aio_read,

	.aio_write =	sock_aio_write,

	.read =		new_sync_read,

	.write =	new_sync_write,

	.read_iter =	sock_read_iter,

	.write_iter =	sock_write_iter,

	.poll =		sock_poll,

	.unlocked_ioctl = sock_ioctl,

#ifdef CONFIG_COMPAT
@@ -845,49 +845,47 @@ 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 sock_aio_read(struct kiocb *iocb, const struct iovec *iov,

				unsigned long nr_segs, loff_t pos)

static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to)

{

	struct file *file = iocb->ki_filp;

	struct socket *sock = file->private_data;

	struct msghdr msg;

	struct msghdr msg = {.msg_iter = *to};

	ssize_t res;



	if (file->f_flags & O_NONBLOCK)

		msg.msg_flags = MSG_DONTWAIT;



	if (pos != 0)

	if (iocb->ki_pos != 0)

		return -ESPIPE;



	if (iocb->ki_nbytes == 0)	/* Match SYS5 behaviour */

		return 0;



	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);

	res = __sock_recvmsg(iocb, sock, &msg,

			     iocb->ki_nbytes, msg.msg_flags);

	*to = msg.msg_iter;

	return res;

}



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

			  unsigned long nr_segs, loff_t pos)

static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)

{

	struct file *file = iocb->ki_filp;

	struct socket *sock = file->private_data;

	struct msghdr msg;

	struct msghdr msg = {.msg_iter = *from};

	ssize_t res;



	if (pos != 0)

	if (iocb->ki_pos != 0)

		return -ESPIPE;



	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 (file->f_flags & O_NONBLOCK)

		msg.msg_flags = MSG_DONTWAIT;



	if (sock->type == SOCK_SEQPACKET)

		msg.msg_flags |= MSG_EOR;



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

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

	*from = msg.msg_iter;

	return res;

}



/*