From patchwork Mon Aug 13 14:39:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1313321 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 300F03FC23 for ; Mon, 13 Aug 2012 14:40:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580Ab2HMOkW (ORCPT ); Mon, 13 Aug 2012 10:40:22 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:35495 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403Ab2HMOkV (ORCPT ); Mon, 13 Aug 2012 10:40:21 -0400 Received: by yenl14 with SMTP id l14so1982967yen.19 for ; Mon, 13 Aug 2012 07:40:21 -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=g7XZC0tBxEQ50qz7TJm0VU7u5lwGLtXq7AiKIXMhCFk=; b=Anwa7gKxDOO5FqKvHEYpx4qShYKJh0ucaGz8+2ymOgI3QA5HVy/MQ0MGaRrmNil/nl Hq+JgUs3DhEMXtgo8XoCRDL1xh/YCnbOyPbga3vkqbUyDXtb1E6moBXvMgVhC9hqUS9r pKRuD90rb05Qo2lYliCrYvSU7gnoAVPjFIQZ1MuAAvqIo4OlYh7kr9ZYyzE0/HpTGsJ1 u7JYVMvAYY67FjetPJ/lfc4eww5vFbw694O1IP/KTmii3rn3SF41hxf4rJfr61A0MuFJ Banj6fayOqLHSSp7Icxx926LoTm4lufYfCMoXERjh9/81fw/Ur0CyPaP+MfKjP+dGHkY ORqg== Received: by 10.68.193.162 with SMTP id hp2mr18798087pbc.34.1344868820696; Mon, 13 Aug 2012 07:40:20 -0700 (PDT) Received: from debian-sid.localdomain ([123.115.214.125]) by mx.google.com with ESMTPS id pj10sm5359739pbb.46.2012.08.13.07.40.16 (version=SSLv3 cipher=OTHER); Mon, 13 Aug 2012 07:40:20 -0700 (PDT) From: Peng Tao To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, bharrosh@panasas.com, Peng Tao Subject: [PATCH-v2 1/3] NFS: track direct IO left bytes Date: Mon, 13 Aug 2012 22:39:34 +0800 Message-Id: <1344868776-1739-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 Signed-off-by: Peng Tao --- fs/nfs/direct.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 34a6282..c39f775 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -78,6 +78,7 @@ struct nfs_direct_req { atomic_t io_count; /* i/os we're waiting for */ spinlock_t lock; /* protect completion state */ ssize_t count, /* bytes actually processed */ + bytes_left, /* bytes left to be sent */ error; /* any reported error */ struct completion completion; /* wait for i/o completion */ @@ -390,6 +391,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de user_addr += req_len; pos += req_len; count -= req_len; + dreq->bytes_left -= req_len; } /* The nfs_page now hold references to these pages */ nfs_direct_release_pages(pagevec, npages); @@ -456,6 +458,7 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, const struct iovec *iov, goto out; dreq->inode = inode; + dreq->bytes_left = iov_length(iov, nr_segs); dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp)); dreq->l_ctx = nfs_get_lock_context(dreq->ctx); if (dreq->l_ctx == NULL) @@ -706,6 +709,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d user_addr += req_len; pos += req_len; count -= req_len; + dreq->bytes_left -= req_len; } /* The nfs_page now hold references to these pages */ nfs_direct_release_pages(pagevec, npages); @@ -855,6 +859,7 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, const struct iovec *iov, goto out; dreq->inode = inode; + dreq->bytes_left = count; dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp)); dreq->l_ctx = nfs_get_lock_context(dreq->ctx); if (dreq->l_ctx == NULL)