Commit a886038b authored by Al Viro's avatar Al Viro

fs/block_dev.c: switch to ->read_iter()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2ba5bbed
...@@ -1532,23 +1532,19 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, ...@@ -1532,23 +1532,19 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
} }
EXPORT_SYMBOL_GPL(blkdev_aio_write); EXPORT_SYMBOL_GPL(blkdev_aio_write);
static ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov, static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
unsigned long nr_segs, loff_t pos)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
struct inode *bd_inode = file->f_mapping->host; struct inode *bd_inode = file->f_mapping->host;
loff_t size = i_size_read(bd_inode); loff_t size = i_size_read(bd_inode);
size_t count = iocb->ki_nbytes; loff_t pos = iocb->ki_pos;
struct iov_iter to;
iov_iter_init(&to, READ, iov, nr_segs, count);
if (pos >= size) if (pos >= size)
return 0; return 0;
size -= pos; size -= pos;
iov_iter_truncate(&to, size); iov_iter_truncate(to, size);
return generic_file_read_iter(iocb, &to); return generic_file_read_iter(iocb, to);
} }
/* /*
...@@ -1580,9 +1576,9 @@ const struct file_operations def_blk_fops = { ...@@ -1580,9 +1576,9 @@ const struct file_operations def_blk_fops = {
.open = blkdev_open, .open = blkdev_open,
.release = blkdev_close, .release = blkdev_close,
.llseek = block_llseek, .llseek = block_llseek,
.read = do_sync_read, .read = new_sync_read,
.write = do_sync_write, .write = do_sync_write,
.aio_read = blkdev_aio_read, .read_iter = blkdev_read_iter,
.aio_write = blkdev_aio_write, .aio_write = blkdev_aio_write,
.mmap = generic_file_mmap, .mmap = generic_file_mmap,
.fsync = blkdev_fsync, .fsync = blkdev_fsync,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment