diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-22 23:35:42 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-05 18:23:56 -0400 |
| commit | 82c156f853840645604acd7c2cebcb75ed1b6652 (patch) | |
| tree | 19d74fbaafb300aa05523ad0ecb60f24f82c5d1f /fs/coda | |
| parent | 241699cd72a8489c9446ae3910ddd243e9b9061b (diff) | |
| download | linux-0-day-82c156f853840645604acd7c2cebcb75ed1b6652.tar.gz linux-0-day-82c156f853840645604acd7c2cebcb75ed1b6652.tar.xz | |
switch generic_file_splice_read() to use of ->read_iter()
... and kill the ->splice_read() instances that can be switched to it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/coda')
| -rw-r--r-- | fs/coda/file.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/fs/coda/file.c b/fs/coda/file.c index f47c7483863b5..8415d4f8d1a1c 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c @@ -38,27 +38,6 @@ coda_file_read_iter(struct kiocb *iocb, struct iov_iter *to) } static ssize_t -coda_file_splice_read(struct file *coda_file, loff_t *ppos, - struct pipe_inode_info *pipe, size_t count, - unsigned int flags) -{ - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); - struct coda_file_info *cfi; - struct file *host_file; - - cfi = CODA_FTOC(coda_file); - BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); - host_file = cfi->cfi_container; - - splice_read = host_file->f_op->splice_read; - if (!splice_read) - splice_read = default_file_splice_read; - - return splice_read(host_file, ppos, pipe, count, flags); -} - -static ssize_t coda_file_write_iter(struct kiocb *iocb, struct iov_iter *to) { struct file *coda_file = iocb->ki_filp; @@ -225,6 +204,6 @@ const struct file_operations coda_file_operations = { .open = coda_open, .release = coda_release, .fsync = coda_fsync, - .splice_read = coda_file_splice_read, + .splice_read = generic_file_splice_read, }; |