leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: fold xfs_vm_do_dio into xfs_vm_direct_IO

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig
2016-02-08 14:40:51 +11:00
committed by Dave Chinner
parent 273dda76f7
commit c19b104a67
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fs/xfs/xfs_aops.c
View File

@@ -1596,26 +1596,6 @@ xfs_end_io_direct_write(
return error; return error;
} }
static inline ssize_t
xfs_vm_do_dio(
struct inode *inode,
struct kiocb *iocb,
struct iov_iter *iter,
loff_t offset,
dio_iodone_t endio,
int flags)
{
struct block_device *bdev;
if (IS_DAX(inode))
return dax_do_io(iocb, inode, iter, offset,
xfs_get_blocks_direct, endio, 0);
bdev = xfs_find_bdev_for_inode(inode);
return __blockdev_direct_IO(iocb, inode, bdev, iter, offset,
xfs_get_blocks_direct, endio, NULL, flags);
}
STATIC ssize_t STATIC ssize_t
xfs_vm_direct_IO( xfs_vm_direct_IO(
struct kiocb *iocb, struct kiocb *iocb,
@@ -1623,11 +1603,23 @@ xfs_vm_direct_IO(
loff_t offset) loff_t offset)
{ {
struct inode *inode = iocb->ki_filp->f_mapping->host; struct inode *inode = iocb->ki_filp->f_mapping->host;
dio_iodone_t *endio = NULL;
int flags = 0;
struct block_device *bdev;
if (iov_iter_rw(iter) == WRITE) if (iov_iter_rw(iter) == WRITE) {
return xfs_vm_do_dio(inode, iocb, iter, offset, endio = xfs_end_io_direct_write;
xfs_end_io_direct_write, DIO_ASYNC_EXTEND); flags = DIO_ASYNC_EXTEND;
return xfs_vm_do_dio(inode, iocb, iter, offset, NULL, 0); }
if (IS_DAX(inode)) {
return dax_do_io(iocb, inode, iter, offset,
xfs_get_blocks_direct, endio, 0);
}
bdev = xfs_find_bdev_for_inode(inode);
return __blockdev_direct_IO(iocb, inode, bdev, iter, offset,
xfs_get_blocks_direct, endio, NULL, flags);
} }
/* /*