From patchwork Tue Aug 14 13:52:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 1319421 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 6716FDF215 for ; Tue, 14 Aug 2012 13:54:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751739Ab2HNNyS (ORCPT ); Tue, 14 Aug 2012 09:54:18 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:38437 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750861Ab2HNNyS (ORCPT ); Tue, 14 Aug 2012 09:54:18 -0400 Received: by mail-yw0-f46.google.com with SMTP id m54so439745yhm.19 for ; Tue, 14 Aug 2012 06:54:18 -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=BNHMnXDydsw594Yg9s8ZiwTXNdQgctHIlOPCE84lJrg=; b=kQ28KuVVJSUwwNf5YSaU3a8aFY1RHzVfZsBBzn1W66bhAAdVM2ZfcXeyIDGhMAeRfy 9V03OAN2LezPbRNPZTa3lmr54v7OaaaJScErQ+uZKRtS4ERgWoeYVq7FaHjn5UTrJQAQ 0sCsEDQ2VVfCFXf7P/P1VSrgc69c8frqQfUN8GA1Fv8p2+E0xf/tax1hXcmSAzomWy+W jODJgYTRFUDLTJ1FqmYbOaZjliZMPouTlPjPbKTknRuzGcnPHhDwDVV8oq7hli0zjBXK uLPFeOD+BLcoqu81QRmhUuukXLTK83/LQnmsREpyxCdjmgG7XQc/Qyxki2YuDDSeazUo Sa9g== Received: by 10.66.88.198 with SMTP id bi6mr28972402pab.23.1344952457606; Tue, 14 Aug 2012 06:54:17 -0700 (PDT) Received: from localhost.localdomain ([123.115.214.125]) by mx.google.com with ESMTPS id tq4sm796886pbc.11.2012.08.14.06.54.13 (version=SSLv3 cipher=OTHER); Tue, 14 Aug 2012 06:54:17 -0700 (PDT) From: Peng Tao To: Trond.Myklebust@netapp.com Cc: bharrosh@panasas.com, linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH-v3 3/3] NFS41: send real read size in layoutget Date: Tue, 14 Aug 2012 21:52:24 +0800 Message-Id: <1344952344-1435-3-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d In-Reply-To: <1344952344-1435-1-git-send-email-bergwolf@gmail.com> References: <1344952344-1435-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 For buffer read, use offst-to-isize. For direct read, use dreq->bytes_left. Signed-off-by: Peng Tao --- fs/nfs/pnfs.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 9ff45d1..4a250a4 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1153,16 +1153,24 @@ out_forget_reply: void pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) { + u64 rd_size = req->wb_bytes; + BUG_ON(pgio->pg_lseg != NULL); if (req->wb_offset != req->wb_pgbase) { nfs_pageio_reset_read_mds(pgio); return; } + + if (pgio->pg_dreq == NULL) + rd_size = i_size_read(pgio->pg_inode) - req_offset(req); + else + rd_size = nfs_dreq_bytes_left(pgio->pg_dreq); + pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, req->wb_context, req_offset(req), - req->wb_bytes, + rd_size, IOMODE_READ, GFP_KERNEL); /* If no lseg, fall back to read through mds */