From patchwork Wed Aug 8 01:49:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1291791 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1A0DADF280 for ; Wed, 8 Aug 2012 01:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755380Ab2HHBtz (ORCPT ); Tue, 7 Aug 2012 21:49:55 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:39258 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754699Ab2HHBtz (ORCPT ); Tue, 7 Aug 2012 21:49:55 -0400 Received: by pbbrr13 with SMTP id rr13so599912pbb.19 for ; Tue, 07 Aug 2012 18:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=W5+nd+iblLgVYnEHGtuG8/YolhB9Ri8t3otJZf10tcs=; b=U+4RSKd3YHDnVjiqk0+YGm7SKJjrx5XnBDnP4KSa2f47zqI3O2S3u2OiTrjTKqZ4U9 +kmUXlqe0/IiMfg+JsdFTPOdiMK4fffYCs49ovZlgzTJX0FSf/3VHkDmD4L7nXdQUUOF vp4YYYS4RivSMlG5mbsVdmwHW6zz883c4cGX5pMlFpeBdJKzxlLkCnBvCo1/Rd2dBquQ lRhIdmjUzS7jN6LxD5DDd2C4aMNMp1SEdamu+IdKETDyE8cmK3wgi7fBkkk+le+f2jUI q6FnoPn9z284ve8Z4uJPw2SkhVAikrEQxubtynamfrU0E33CebHcwGzltk6BlBSQWZEi YX5g== Received: by 10.68.241.228 with SMTP id wl4mr32101104pbc.51.1344390594689; Tue, 07 Aug 2012 18:49:54 -0700 (PDT) Received: from debian-sid.localdomain ([123.115.212.137]) by mx.google.com with ESMTPS id rs4sm8840988pbc.0.2012.08.07.18.49.51 (version=SSLv3 cipher=OTHER); Tue, 07 Aug 2012 18:49:54 -0700 (PDT) From: Peng Tao To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 1/2] NFSv41: fix DIO write_io calculation Date: Wed, 8 Aug 2012 09:49:36 +0800 Message-Id: <1344390577-1602-1-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org pnfs_within_mdsthreshold() is called inside pg_init. We need to set read_io/write_io before that. Cc: Andy Adamson Signed-off-by: Peng Tao --- fs/nfs/direct.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 1ba385b..34a6282 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -463,10 +463,10 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, const struct iovec *iov, if (!is_sync_kiocb(iocb)) dreq->iocb = iocb; + NFS_I(inode)->read_io += iov_length(iov, nr_segs); result = nfs_direct_read_schedule_iovec(dreq, iov, nr_segs, pos, uio); if (!result) result = nfs_direct_wait(dreq); - NFS_I(inode)->read_io += result; out_release: nfs_direct_req_release(dreq); out: @@ -814,6 +814,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, get_dreq(dreq); atomic_inc(&inode->i_dio_count); + NFS_I(dreq->inode)->write_io += iov_length(iov, nr_segs); for (seg = 0; seg < nr_segs; seg++) { const struct iovec *vec = &iov[seg]; result = nfs_direct_write_schedule_segment(&desc, vec, pos, uio); @@ -825,7 +826,6 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, pos += vec->iov_len; } nfs_pageio_complete(&desc); - NFS_I(dreq->inode)->write_io += desc.pg_bytes_written; /* * If no bytes were started, return the error, and let the