f2fs: correct statistic of APP_DIRECT_IO/APP_DIRECT_READ_IO
authorJack Qiu <jack.qiu@huawei.com>
Mon, 31 Aug 2020 01:58:02 +0000 (09:58 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 11 Sep 2020 18:11:24 +0000 (11:11 -0700)
Miss to update APP_DIRECT_IO/APP_DIRECT_READ_IO when receiving async DIO.
For example: fio -filename=/data/test.0 -bs=1m -ioengine=libaio -direct=1
-name=fill -size=10m -numjobs=1 -iodepth=32 -rw=write

Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/data.c

index 6a20f2e..a490e1b 100644 (file)
@@ -3673,12 +3673,18 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
                                                                        err);
                        if (!do_opu)
                                set_inode_flag(inode, FI_UPDATE_WRITE);
+               } else if (err == -EIOCBQUEUED) {
+                       f2fs_update_iostat(F2FS_I_SB(inode), APP_DIRECT_IO,
+                                               count - iov_iter_count(iter));
                } else if (err < 0) {
                        f2fs_write_failed(mapping, offset + count);
                }
        } else {
                if (err > 0)
                        f2fs_update_iostat(sbi, APP_DIRECT_READ_IO, err);
+               else if (err == -EIOCBQUEUED)
+                       f2fs_update_iostat(F2FS_I_SB(inode), APP_DIRECT_READ_IO,
+                                               count - iov_iter_count(iter));
        }
 
 out: