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

Commit 15316263 authored by Al Viro's avatar Al Viro
Browse files

fuse: switch fuse_direct_io_file_operations to ->{read,write}_iter()



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent cfa86a74
Loading
Loading
Loading
Loading
+12 −17
Original line number Diff line number Diff line
@@ -1401,14 +1401,10 @@ static ssize_t __fuse_direct_read(struct fuse_io_priv *io,
	return res;
}

static ssize_t fuse_direct_read(struct file *file, char __user *buf,
				     size_t count, loff_t *ppos)
static ssize_t fuse_direct_read_iter(struct kiocb *iocb, struct iov_iter *to)
{
	struct fuse_io_priv io = { .async = 0, .file = file };
	struct iovec iov = { .iov_base = buf, .iov_len = count };
	struct iov_iter ii;
	iov_iter_init(&ii, READ, &iov, 1, count);
	return __fuse_direct_read(&io, &ii, ppos);
	struct fuse_io_priv io = { .async = 0, .file = iocb->ki_filp };
	return __fuse_direct_read(&io, to, &iocb->ki_pos);
}

static ssize_t __fuse_direct_write(struct fuse_io_priv *io,
@@ -1432,24 +1428,21 @@ static ssize_t __fuse_direct_write(struct fuse_io_priv *io,
	return res;
}

static ssize_t fuse_direct_write(struct file *file, const char __user *buf,
				 size_t count, loff_t *ppos)
static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
	struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };
	struct file *file = iocb->ki_filp;
	struct inode *inode = file_inode(file);
	ssize_t res;
	struct fuse_io_priv io = { .async = 0, .file = file };
	struct iov_iter ii;
	iov_iter_init(&ii, WRITE, &iov, 1, count);
	ssize_t res;

	if (is_bad_inode(inode))
		return -EIO;

	/* Don't allow parallel writes to the same file */
	mutex_lock(&inode->i_mutex);
	res = __fuse_direct_write(&io, &ii, ppos);
	res = __fuse_direct_write(&io, from, &iocb->ki_pos);
	if (res > 0)
		fuse_write_update_size(inode, *ppos);
		fuse_write_update_size(inode, iocb->ki_pos);
	mutex_unlock(&inode->i_mutex);

	return res;
@@ -2988,8 +2981,10 @@ static const struct file_operations fuse_file_operations = {

static const struct file_operations fuse_direct_io_file_operations = {
	.llseek		= fuse_file_llseek,
	.read		= fuse_direct_read,
	.write		= fuse_direct_write,
	.read		= new_sync_read,
	.read_iter	= fuse_direct_read_iter,
	.write		= new_sync_write,
	.write_iter	= fuse_direct_write_iter,
	.mmap		= fuse_direct_mmap,
	.open		= fuse_open,
	.flush		= fuse_flush,