Commit 3e20a751 authored by Al Viro's avatar Al Viro
Browse files

switch new_sync_{read,write}() to ITER_UBUF 



Reviewed-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent fcb14cb1

fs/read_write.c

+2 −4
Original line number Diff line number Diff line
@@ -378,14 +378,13 @@ EXPORT_SYMBOL(rw_verify_area); 


static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)

{

	struct iovec iov = { .iov_base = buf, .iov_len = len };

	struct kiocb kiocb;

	struct iov_iter iter;

	ssize_t ret;



	init_sync_kiocb(&kiocb, filp);

	kiocb.ki_pos = (ppos ? *ppos : 0);

	iov_iter_init(&iter, READ, &iov, 1, len);

	iov_iter_ubuf(&iter, READ, buf, len);



	ret = call_read_iter(filp, &kiocb, &iter);

	BUG_ON(ret == -EIOCBQUEUED);
@@ -481,14 +480,13 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) 


static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)

{

	struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };

	struct kiocb kiocb;

	struct iov_iter iter;

	ssize_t ret;



	init_sync_kiocb(&kiocb, filp);

	kiocb.ki_pos = (ppos ? *ppos : 0);

	iov_iter_init(&iter, WRITE, &iov, 1, len);

	iov_iter_ubuf(&iter, WRITE, (void __user *)buf, len);



	ret = call_write_iter(filp, &kiocb, &iter);

	BUG_ON(ret == -EIOCBQUEUED);