Account complete NFS direct-io reads and writes into Task I/O Accounting. NFS have unusual direct-io implementation, thus accounting in generic code does not work. Signed-off-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx> --- fs/nfs/direct.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 9943a75..bab4185 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -45,6 +45,7 @@ #include <linux/pagemap.h> #include <linux/kref.h> #include <linux/slab.h> +#include <linux/task_io_accounting_ops.h> #include <linux/nfs_fs.h> #include <linux/nfs_page.h> @@ -939,8 +940,10 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov, goto out; retval = nfs_direct_read(iocb, iov, nr_segs, pos); - if (retval > 0) + if (retval > 0) { iocb->ki_pos = pos + retval; + task_io_account_read(retval); + } out: return retval; @@ -1001,8 +1004,10 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, retval = nfs_direct_write(iocb, iov, nr_segs, pos, count); - if (retval > 0) + if (retval > 0) { iocb->ki_pos = pos + retval; + task_io_account_write(retval); + } out: return retval; -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html