From patchwork Wed Aug 8 02:03:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1291831 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 3A027DF280 for ; Wed, 8 Aug 2012 02:03:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755380Ab2HHCDb (ORCPT ); Tue, 7 Aug 2012 22:03:31 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:65416 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754699Ab2HHCDa (ORCPT ); Tue, 7 Aug 2012 22:03:30 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so617318pbb.19 for ; Tue, 07 Aug 2012 19:03:30 -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:in-reply-to:references; bh=ruX2eOcupN2ZvQIa/HB2IiK/27ZX8emp8NTVV3CstOM=; b=BIa6uionYpUj63GRR1mnl22G82IGEG8Hq4gpgzvvCqMZF0jJjAV5IgE7A54PKa4ckA CNIE8Vxk5183NbC/1qTJfgrkZ9ZMK6KjuuHRd+QSy7TWCU34r1+B5MPctDPFXu8kKK25 +m+FBEA8ewQjm9lcXvs9IG/9g0mzDublTuQoLJKNSgsiix0BdyfkYUa9s6XyIh/KzCED ZUJmSk/57aaA9EKy0InLVpDaSsawPxWIbRfL9iFRXvkeQlZKlEZDUFdDtZ50YhQHGlQV acE0H1zp1kNZmv7tRAgdHux1CU9LBX7Tp954FTRBCoitPFX7sn2jYZmQMOrAY74qe5R8 C7/g== Received: by 10.68.220.163 with SMTP id px3mr32872561pbc.167.1344391410728; Tue, 07 Aug 2012 19:03:30 -0700 (PDT) Received: from debian-sid.localdomain ([123.115.212.137]) by mx.google.com with ESMTPS id pj10sm12281300pbb.46.2012.08.07.19.03.28 (version=SSLv3 cipher=OTHER); Tue, 07 Aug 2012 19:03:30 -0700 (PDT) From: Peng Tao To: bharrosh@panasas.com Cc: linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH RFC 1/3] NFS: track direct IO left bytes Date: Wed, 8 Aug 2012 10:03:10 +0800 Message-Id: <1344391392-1948-2-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d In-Reply-To: <1344391392-1948-1-git-send-email-bergwolf@gmail.com> References: <1344391392-1948-1-git-send-email-bergwolf@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Peng Tao 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)