niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

9p: 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-04-01 23:59:57 -04:00
parent 42b1ab979d
commit e494b6b5e1
1 changed files with 39 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
fs/9p/vfs_file.c
View file

@ -374,23 +374,19 @@ out_err:
*/ */
static ssize_t static ssize_t
v9fs_file_read(struct file *filp, char __user *udata, size_t count, v9fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
loff_t * offset)
{ {
struct p9_fid *fid = filp->private_data; struct p9_fid *fid = iocb->ki_filp->private_data;
struct iovec iov = {.iov_base = udata, .iov_len = count};
struct iov_iter to;
int ret, err; int ret, err;
iov_iter_init(&to, READ, &iov, 1, count); p9_debug(P9_DEBUG_VFS, "count %zu offset %lld\n",
iov_iter_count(to), iocb->ki_pos);
p9_debug(P9_DEBUG_VFS, "count %zu offset %lld\n", count, *offset); ret = p9_client_read(fid, iocb->ki_pos, to, &err);
ret = p9_client_read(fid, *offset, &to, &err);
if (!ret) if (!ret)
return err; return err;
*offset += ret; iocb->ki_pos += ret;
return ret; return ret;
} }
@ -403,33 +399,26 @@ v9fs_file_read(struct file *filp, char __user *udata, size_t count,
* *
*/ */
static ssize_t static ssize_t
v9fs_file_write(struct file *filp, const char __user * data, v9fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
size_t count, loff_t *offset)
{ {
struct file *file = iocb->ki_filp;
ssize_t retval = 0; ssize_t retval = 0;
loff_t origin = *offset; loff_t origin = iocb->ki_pos;
struct iovec iov = {.iov_base = (void __user *)data, .iov_len = count}; size_t count = iov_iter_count(from);
struct iov_iter from;
int err = 0; int err = 0;
iov_iter_init(&from, WRITE, &iov, 1, count); retval = generic_write_checks(file, &origin, &count, 0);
retval = generic_write_checks(filp, &origin, &count, 0);
if (retval) if (retval)
return retval; return retval;
iov_iter_truncate(&from, count); iov_iter_truncate(from, count);
p9_debug(P9_DEBUG_VFS, "data %p count %d offset %x\n",
data, (int)count, (int)*offset);
retval = 0;
if (!count) if (!count)
return 0; return 0;
retval = p9_client_write(filp->private_data, origin, &from, &err); retval = p9_client_write(file->private_data, origin, from, &err);
if (retval > 0) { if (retval > 0) {
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(file);
loff_t i_size; loff_t i_size;
unsigned long pg_start, pg_end; unsigned long pg_start, pg_end;
pg_start = origin >> PAGE_CACHE_SHIFT; pg_start = origin >> PAGE_CACHE_SHIFT;
@ -437,18 +426,18 @@ v9fs_file_write(struct file *filp, const char __user * data,
if (inode->i_mapping && inode->i_mapping->nrpages) if (inode->i_mapping && inode->i_mapping->nrpages)
invalidate_inode_pages2_range(inode->i_mapping, invalidate_inode_pages2_range(inode->i_mapping,
pg_start, pg_end); pg_start, pg_end);
*offset += retval; origin += retval;
i_size = i_size_read(inode); i_size = i_size_read(inode);
if (*offset > i_size) { iocb->ki_pos = origin;
inode_add_bytes(inode, *offset - i_size); if (origin > i_size) {
i_size_write(inode, *offset); inode_add_bytes(inode, origin - i_size);
i_size_write(inode, origin);
} }
return retval; return retval;
} }
return err; return err;
} }
static int v9fs_file_fsync(struct file *filp, loff_t start, loff_t end, static int v9fs_file_fsync(struct file *filp, loff_t start, loff_t end,
int datasync) int datasync)
{ {
@ -584,11 +573,10 @@ out_unlock:
* *
*/ */
static ssize_t static ssize_t
v9fs_mmap_file_read(struct file *filp, char __user *data, size_t count, v9fs_mmap_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
loff_t *offset)
{ {
/* TODO: Check if there are dirty pages */ /* TODO: Check if there are dirty pages */
return v9fs_file_read(filp, data, count, offset); return v9fs_file_read_iter(iocb, to);
} }
/** /**
@ -600,14 +588,13 @@ v9fs_mmap_file_read(struct file *filp, char __user *data, size_t count,
* *
*/ */
static ssize_t static ssize_t
v9fs_mmap_file_write(struct file *filp, const char __user *data, v9fs_mmap_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
size_t count, loff_t *offset)
{ {
/* /*
* TODO: invalidate mmaps on filp's inode between * TODO: invalidate mmaps on filp's inode between
* offset and offset+count * offset and offset+count
*/ */
return v9fs_file_write(filp, data, count, offset); return v9fs_file_write_iter(iocb, from);
} }
static void v9fs_mmap_vm_close(struct vm_area_struct *vma) static void v9fs_mmap_vm_close(struct vm_area_struct *vma)
@ -679,8 +666,10 @@ const struct file_operations v9fs_cached_file_operations_dotl = {
const struct file_operations v9fs_file_operations = { const struct file_operations v9fs_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = v9fs_file_read, .read = new_sync_read,
.write = v9fs_file_write, .write = new_sync_write,
.read_iter = v9fs_file_read_iter,
.write_iter = v9fs_file_write_iter,
.open = v9fs_file_open, .open = v9fs_file_open,
.release = v9fs_dir_release, .release = v9fs_dir_release,
.lock = v9fs_file_lock, .lock = v9fs_file_lock,
@ -690,8 +679,10 @@ const struct file_operations v9fs_file_operations = {
const struct file_operations v9fs_file_operations_dotl = { const struct file_operations v9fs_file_operations_dotl = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = v9fs_file_read, .read = new_sync_read,
.write = v9fs_file_write, .write = new_sync_write,
.read_iter = v9fs_file_read_iter,
.write_iter = v9fs_file_write_iter,
.open = v9fs_file_open, .open = v9fs_file_open,
.release = v9fs_dir_release, .release = v9fs_dir_release,
.lock = v9fs_file_lock_dotl, .lock = v9fs_file_lock_dotl,
@ -702,8 +693,10 @@ const struct file_operations v9fs_file_operations_dotl = {
const struct file_operations v9fs_mmap_file_operations = { const struct file_operations v9fs_mmap_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = v9fs_mmap_file_read, .read = new_sync_read,
.write = v9fs_mmap_file_write, .write = new_sync_write,
.read_iter = v9fs_mmap_file_read_iter,
.write_iter = v9fs_mmap_file_write_iter,
.open = v9fs_file_open, .open = v9fs_file_open,
.release = v9fs_dir_release, .release = v9fs_dir_release,
.lock = v9fs_file_lock, .lock = v9fs_file_lock,
@ -713,8 +706,10 @@ const struct file_operations v9fs_mmap_file_operations = {
const struct file_operations v9fs_mmap_file_operations_dotl = { const struct file_operations v9fs_mmap_file_operations_dotl = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = v9fs_mmap_file_read, .read = new_sync_read,
.write = v9fs_mmap_file_write, .write = new_sync_write,
.read_iter = v9fs_mmap_file_read_iter,
.write_iter = v9fs_mmap_file_write_iter,
.open = v9fs_file_open, .open = v9fs_file_open,
.release = v9fs_dir_release, .release = v9fs_dir_release,
.lock = v9fs_file_lock_dotl, .lock = v9fs_file_lock_dotl,