samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hypfs: switch to read_iter/write_iter

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2015-02-04 16:17:45 -05:00
parent db671a8ecd
commit a457ac2854
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
arch/s390/hypfs/inode.c
View File

@@ -144,36 +144,32 @@ static int hypfs_open(struct inode *inode, struct file *filp)
return nonseekable_open(inode, filp); return nonseekable_open(inode, filp);
} }
static ssize_t hypfs_aio_read(struct kiocb *iocb, const struct iovec *iov, static ssize_t hypfs_read_iter(struct kiocb *iocb, struct iov_iter *to)
unsigned long nr_segs, loff_t offset)
{ {
char *data; struct file *file = iocb->ki_filp;
ssize_t ret; char *data = file->private_data;
struct file *filp = iocb->ki_filp; size_t available = strlen(data);
/* XXX: temporary */ loff_t pos = iocb->ki_pos;
char __user *buf = iov[0].iov_base; size_t count;
size_t count = iov[0].iov_len;
if (nr_segs != 1) if (pos < 0)
return -EINVAL; return -EINVAL;
if (pos >= available || !iov_iter_count(to))
data = filp->private_data; return 0;
ret = simple_read_from_buffer(buf, count, &offset, data, strlen(data)); count = copy_to_iter(data + pos, available - pos, to);
if (ret <= 0) if (!count)
return ret; return -EFAULT;
iocb->ki_pos = pos + count;
iocb->ki_pos += ret; file_accessed(file);
file_accessed(filp); return count;
return ret;
} }
static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t offset) static ssize_t hypfs_write_iter(struct kiocb *iocb, struct iov_iter *from)
{ {
int rc; int rc;
struct super_block *sb = file_inode(iocb->ki_filp)->i_sb; struct super_block *sb = file_inode(iocb->ki_filp)->i_sb;
struct hypfs_sb_info *fs_info = sb->s_fs_info; struct hypfs_sb_info *fs_info = sb->s_fs_info;
size_t count = iov_length(iov, nr_segs); size_t count = iov_iter_count(from);
/* /*
* Currently we only allow one update per second for two reasons: * Currently we only allow one update per second for two reasons:
@@ -202,6 +198,7 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
} }
hypfs_update_update(sb); hypfs_update_update(sb);
rc = count; rc = count;
iov_iter_advance(from, count);
out: out:
mutex_unlock(&fs_info->lock); mutex_unlock(&fs_info->lock);
return rc; return rc;
@@ -440,10 +437,10 @@ struct dentry *hypfs_create_str(struct dentry *dir,
static const struct file_operations hypfs_file_ops = { static const struct file_operations hypfs_file_ops = {
.open = hypfs_open, .open = hypfs_open,
.release = hypfs_release, .release = hypfs_release,
.read = do_sync_read, .read = new_sync_read,
.write = do_sync_write, .write = new_sync_write,
.aio_read = hypfs_aio_read, .read_iter = hypfs_read_iter,
.aio_write = hypfs_aio_write, .write_iter = hypfs_write_iter,
.llseek = no_llseek, .llseek = no_llseek,
}; };