mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
xfs: switch to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
aad4f8bb42
commit
b4f5d2c6d1
1 changed files with 7 additions and 12 deletions
|
@ -229,32 +229,27 @@ xfs_file_fsync(
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC ssize_t
|
STATIC ssize_t
|
||||||
xfs_file_aio_read(
|
xfs_file_read_iter(
|
||||||
struct kiocb *iocb,
|
struct kiocb *iocb,
|
||||||
const struct iovec *iovp,
|
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 *inode = file->f_mapping->host;
|
struct inode *inode = file->f_mapping->host;
|
||||||
struct xfs_inode *ip = XFS_I(inode);
|
struct xfs_inode *ip = XFS_I(inode);
|
||||||
struct xfs_mount *mp = ip->i_mount;
|
struct xfs_mount *mp = ip->i_mount;
|
||||||
size_t size = 0;
|
size_t size = iov_iter_count(to);
|
||||||
ssize_t ret = 0;
|
ssize_t ret = 0;
|
||||||
int ioflags = 0;
|
int ioflags = 0;
|
||||||
xfs_fsize_t n;
|
xfs_fsize_t n;
|
||||||
|
loff_t pos = iocb->ki_pos;
|
||||||
|
|
||||||
XFS_STATS_INC(xs_read_calls);
|
XFS_STATS_INC(xs_read_calls);
|
||||||
|
|
||||||
BUG_ON(iocb->ki_pos != pos);
|
|
||||||
|
|
||||||
if (unlikely(file->f_flags & O_DIRECT))
|
if (unlikely(file->f_flags & O_DIRECT))
|
||||||
ioflags |= IO_ISDIRECT;
|
ioflags |= IO_ISDIRECT;
|
||||||
if (file->f_mode & FMODE_NOCMTIME)
|
if (file->f_mode & FMODE_NOCMTIME)
|
||||||
ioflags |= IO_INVIS;
|
ioflags |= IO_INVIS;
|
||||||
|
|
||||||
size = iov_length(iovp, nr_segs);
|
|
||||||
|
|
||||||
if (unlikely(ioflags & IO_ISDIRECT)) {
|
if (unlikely(ioflags & IO_ISDIRECT)) {
|
||||||
xfs_buftarg_t *target =
|
xfs_buftarg_t *target =
|
||||||
XFS_IS_REALTIME_INODE(ip) ?
|
XFS_IS_REALTIME_INODE(ip) ?
|
||||||
|
@ -307,7 +302,7 @@ xfs_file_aio_read(
|
||||||
|
|
||||||
trace_xfs_file_read(ip, size, pos, ioflags);
|
trace_xfs_file_read(ip, size, pos, ioflags);
|
||||||
|
|
||||||
ret = generic_file_aio_read(iocb, iovp, nr_segs, pos);
|
ret = generic_file_read_iter(iocb, to);
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
XFS_STATS_ADD(xs_read_bytes, ret);
|
XFS_STATS_ADD(xs_read_bytes, ret);
|
||||||
|
|
||||||
|
@ -1453,9 +1448,9 @@ xfs_file_llseek(
|
||||||
|
|
||||||
const struct file_operations xfs_file_operations = {
|
const struct file_operations xfs_file_operations = {
|
||||||
.llseek = xfs_file_llseek,
|
.llseek = xfs_file_llseek,
|
||||||
.read = do_sync_read,
|
.read = new_sync_read,
|
||||||
.write = do_sync_write,
|
.write = do_sync_write,
|
||||||
.aio_read = xfs_file_aio_read,
|
.read_iter = xfs_file_read_iter,
|
||||||
.aio_write = xfs_file_aio_write,
|
.aio_write = xfs_file_aio_write,
|
||||||
.splice_read = xfs_file_splice_read,
|
.splice_read = xfs_file_splice_read,
|
||||||
.splice_write = xfs_file_splice_write,
|
.splice_write = xfs_file_splice_write,
|
||||||
|
|
Loading…
Reference in a new issue