From patchwork Mon Aug 13 14:39: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: 1313341 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 6FBA83FC23 for ; Mon, 13 Aug 2012 14:40:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673Ab2HMOkc (ORCPT ); Mon, 13 Aug 2012 10:40:32 -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 S1751662Ab2HMOkc (ORCPT ); Mon, 13 Aug 2012 10:40:32 -0400 Received: by mail-yx0-f174.google.com with SMTP id l14so1982967yen.19 for ; Mon, 13 Aug 2012 07:40:32 -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=KTt4WD4eWo6Hmre8/u/3GiVChYMqbrLIuiOnXH/tW8M=; b=0eqBbl2BvCuATmNzymr/29YGKrPuOMWg+NPYLBStE6IgQtR4qUKFaaayvWiSoSQDo1 z47go+8Bs9iEHAq5NRY1UqjHkFdy8gTVGORxLQMOG48a6aWdyMVNitzGF57w6QQpwbl7 L7ZYYj5ZJg/VjYLsnXxg1KEU6OQn5cngEdWpJKZ059HkqhIO29sl0qNH0Sp477VJ1Jt6 +v8Ek6+EB48SMQugkYYmjDZg/ZSM0X+u1e4gPsUnJMY8U2QkJyTF4xjejw9PXvx+Bh0e xl3f40RQZLsXu86nBWAAgo55Wru98qWV2jsF4Jjsc3CxwS/F5cbgiPxMtCt89lj8zcSe APww== Received: by 10.68.129.168 with SMTP id nx8mr20109804pbb.112.1344868831664; Mon, 13 Aug 2012 07:40:31 -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.27 (version=SSLv3 cipher=OTHER); Mon, 13 Aug 2012 07:40:31 -0700 (PDT) From: Peng Tao To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, bharrosh@panasas.com, Peng Tao Subject: [PATCH-v2 3/3] NFS41: send real read size in layoutget Date: Mon, 13 Aug 2012 22:39:36 +0800 Message-Id: <1344868776-1739-3-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.7.1.262.g5ef3d In-Reply-To: <1344868776-1739-1-git-send-email-bergwolf@gmail.com> References: <1344868776-1739-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 d1da23a..49d2f2d 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1154,16 +1154,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 */