From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753646Ab1BUTPx (ORCPT ); Mon, 21 Feb 2011 14:15:53 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:49936 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770Ab1BUTPu (ORCPT ); Mon, 21 Feb 2011 14:15:50 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=aZ/P3f914qQtyYgnlHPzkIcO7wqwVU7YIwjIrJSiwjdoMmpNJC8KtFlaYFTwcbTUey uuNtN5N3RwVuWfN/57XRzBGUNyeOVF1bnT6kIPTiWyuzmj3QhHF9rd2aYRog050GcdM9 nSUIA1Up0cOxldNLQvitqo7CkEVfWq1yrUpNY= Subject: [PATCH] NFS: account direct-io into task io accounting To: linux-nfs@vger.kernel.org From: Konstantin Khlebnikov Cc: Trond Myklebust , linux-kernel@vger.kernel.org Date: Mon, 21 Feb 2011 22:15:46 +0300 Message-ID: <20110221191546.5920.96947.stgit@localhost6> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 #include #include +#include #include #include @@ -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;