From patchwork Fri Feb 11 01:52:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 550301 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1BI0iWH025866 for ; Fri, 11 Feb 2011 18:00:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757802Ab1BKSA5 (ORCPT ); Fri, 11 Feb 2011 13:00:57 -0500 Received: from mx2.netapp.com ([216.240.18.37]:51329 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757749Ab1BKSAn (ORCPT ); Fri, 11 Feb 2011 13:00:43 -0500 X-IronPort-AV: E=Sophos;i="4.60,456,1291622400"; d="scan'208";a="517277371" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 11 Feb 2011 10:00:30 -0800 Received: from localhost.localdomain (lacsina2-lxp.hq.netapp.com [10.58.58.196] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1BI0PW7026041; Fri, 11 Feb 2011 10:00:29 -0800 (PST) From: andros@netapp.com To: bhalevy@panasas.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 03/17] SQUASHME rename orig_offset to mds_offset Date: Thu, 10 Feb 2011 20:52:36 -0500 Message-Id: <1297389170-26702-4-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1297389170-26702-3-git-send-email-andros@netapp.com> References: <1297389170-26702-1-git-send-email-andros@netapp.com> <1297389170-26702-2-git-send-email-andros@netapp.com> <1297389170-26702-3-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 11 Feb 2011 18:00:58 +0000 (UTC) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 05fcc6a..61f21b6 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -201,10 +201,10 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data) struct nfs_read_data *rdata = (struct nfs_read_data *)data; dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status); - if (rdata->orig_offset) { + if (rdata->mds_offset) { dprintk("%s new off %llu orig offset %llu\n", __func__, - rdata->args.offset, rdata->orig_offset); - rdata->args.offset = rdata->orig_offset; + rdata->args.offset, rdata->mds_offset); + rdata->args.offset = rdata->mds_offset; } /* Note this may cause RPC to be resent */ @@ -256,7 +256,7 @@ filelayout_read_pagelist(struct nfs_read_data *data) data->args.fh = fh; data->args.offset = filelayout_get_dserver_offset(lseg, offset); - data->orig_offset = offset; + data->mds_offset = offset; /* Perform an asynchronous read to ds */ nfs_initiate_read(data, ds->ds_clp->cl_rpcclient, diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index c91f468..935d8ff 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1021,7 +1021,7 @@ struct nfs_read_data { struct nfs_client *ds_clp; /* pNFS data server */ const struct rpc_call_ops *call_ops; /* For pNFS recovery to MDS */ int (*read_done_cb) (struct rpc_task *task, struct nfs_read_data *data); - __u64 orig_offset; /* Filelayout dense stripe */ + __u64 mds_offset; struct page *page_array[NFS_PAGEVEC_SIZE]; };