projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto: qat - Intel(R) QAT FW interface
[firefly-linux-kernel-4.4.55.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index 5402481c28d190a83718f6b1897eec78df4c0209..f484c276e994923a5c05577b42d5a9dcc58ae7cc 100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-1406,8
+1406,7
@@
shmem_write_end(struct file *file, struct address_space *mapping,
return copied;
}
return copied;
}
-static ssize_t shmem_file_aio_read(struct kiocb *iocb,
- const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
{
struct file *file = iocb->ki_filp;
struct inode *inode = file_inode(file);
{
struct file *file = iocb->ki_filp;
struct inode *inode = file_inode(file);
@@
-1416,15
+1415,8
@@
static ssize_t shmem_file_aio_read(struct kiocb *iocb,
unsigned long offset;
enum sgp_type sgp = SGP_READ;
int error = 0;
unsigned long offset;
enum sgp_type sgp = SGP_READ;
int error = 0;
- ssize_t retval;
- size_t count;
+ ssize_t retval = 0;
loff_t *ppos = &iocb->ki_pos;
loff_t *ppos = &iocb->ki_pos;
- struct iov_iter iter;
-
- retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
- if (retval)
- return retval;
- iov_iter_init(&iter, iov, nr_segs, count, 0);
/*
* Might this read be for a stacking filesystem? Then when reading
/*
* Might this read be for a stacking filesystem? Then when reading
@@
-1500,14
+1492,14
@@
static ssize_t shmem_file_aio_read(struct kiocb *iocb,
* Ok, we have the page, and it's up-to-date, so
* now we can copy it to user space...
*/
* Ok, we have the page, and it's up-to-date, so
* now we can copy it to user space...
*/
- ret = copy_page_to_iter(page, offset, nr,
&iter
);
+ ret = copy_page_to_iter(page, offset, nr,
to
);
retval += ret;
offset += ret;
index += offset >> PAGE_CACHE_SHIFT;
offset &= ~PAGE_CACHE_MASK;
page_cache_release(page);
retval += ret;
offset += ret;
index += offset >> PAGE_CACHE_SHIFT;
offset &= ~PAGE_CACHE_MASK;
page_cache_release(page);
- if (!iov_iter_count(
&iter
))
+ if (!iov_iter_count(
to
))
break;
if (ret < nr) {
error = -EFAULT;
break;
if (ret < nr) {
error = -EFAULT;
@@
-2629,13
+2621,13
@@
static const struct file_operations shmem_file_operations = {
.mmap = shmem_mmap,
#ifdef CONFIG_TMPFS
.llseek = shmem_file_llseek,
.mmap = shmem_mmap,
#ifdef CONFIG_TMPFS
.llseek = shmem_file_llseek,
- .read =
do
_sync_read,
- .write =
do
_sync_write,
- .
aio_read = shmem_file_aio_read
,
- .
aio_write = generic_file_aio_write
,
+ .read =
new
_sync_read,
+ .write =
new
_sync_write,
+ .
read_iter = shmem_file_read_iter
,
+ .
write_iter = generic_file_write_iter
,
.fsync = noop_fsync,
.splice_read = shmem_file_splice_read,
.fsync = noop_fsync,
.splice_read = shmem_file_splice_read,
- .splice_write =
generic
_file_splice_write,
+ .splice_write =
iter
_file_splice_write,
.fallocate = shmem_fallocate,
#endif
};
.fallocate = shmem_fallocate,
#endif
};