From: Zheng Liu <wenqing.lz@xxxxxxxxxx>
ext4_ios_submit_io() function is defined to be called by __blockdev_direct_IO()
to count direct io.
CC: Jens Axboe <axboe@xxxxxxxxx>
CC: Steven Whitehouse <swhiteho@xxxxxxxxxx>
CC: Aditya Kali <adityakali@xxxxxxxxxx>
Signed-off-by: Wang Shaoyan <wangshaoyan.pt@xxxxxxxxxx>
Signed-off-by: Zheng Liu <wenqing.lz@xxxxxxxxxx>
---
fs/ext4/ext4.h | 2 ++
fs/ext4/indirect.c | 9 ++++++---
fs/ext4/inode.c | 13 ++++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6b90493..617be9f 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1919,6 +1919,8 @@ extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);
extern qsize_t *ext4_get_reserved_space(struct inode *inode);
extern void ext4_da_update_reserve_space(struct inode *inode,
int used, int quota_claim);
+extern void ext4_ios_submit_io(int rw, struct bio *bio,
+ struct inode *inode, loff_t file_offset);
/* indirect.c */
extern int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index dc5046b..c3318df 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -821,10 +821,13 @@ retry:
ret = __blockdev_direct_IO(rw, iocb, inode,
inode->i_sb->s_bdev, iov,
offset, nr_segs,
- ext4_get_block, NULL, NULL, 0);
+ ext4_get_block, NULL, ext4_ios_submit_io, 0);
} else {
- ret = blockdev_direct_IO(rw, iocb, inode, iov,
- offset, nr_segs, ext4_get_block);
+ ret = __blockdev_direct_IO(rw, iocb, inode,
+ inode->i_sb->s_bdev, iov,
+ offset, nr_segs,
+ ext4_get_block, NULL, ext4_ios_submit_io,
+ DIO_LOCKING | DIO_SKIP_HOLES);
if (unlikely((rw & WRITE) && ret < 0)) {
loff_t isize = i_size_read(inode);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3cd862d..2a2fa16 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2962,7 +2962,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
offset, nr_segs,
ext4_get_block_write,
ext4_end_io_dio,
- NULL,
+ ext4_ios_submit_io,
DIO_LOCKING | DIO_SKIP_HOLES);
if (iocb->private)
EXT4_I(inode)->cur_aio_dio = NULL;
@@ -3003,6 +3003,17 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
return ext4_ind_direct_IO(rw, iocb, iov, offset, nr_segs);
}
+void ext4_ios_submit_io(int rw, struct bio *bio,
+ struct inode *inode, loff_t file_offset)
+{
+ int tmprw = !!rw;
+
+ /* ext4 io type accouting */
+ __ext4_io_stat(inode->i_sb, tmprw, EXT4_IOS_REGULAR_DATA,
+ ext4_blocks_per_page(inode));
+ submit_bio(rw, bio);
+}
+
static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
const struct iovec *iov, loff_t offset,
unsigned long nr_segs)
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
