From patchwork Fri Feb 11 01:52:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 550221 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 p1BI0iW9025866 for ; Fri, 11 Feb 2011 18:00:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757875Ab1BKSAo (ORCPT ); Fri, 11 Feb 2011 13:00:44 -0500 Received: from mx2.netapp.com ([216.240.18.37]:51331 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757733Ab1BKSAo (ORCPT ); Fri, 11 Feb 2011 13:00:44 -0500 X-IronPort-AV: E=Sophos;i="4.60,456,1291622400"; d="scan'208";a="517277529" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 11 Feb 2011 10:00:34 -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 p1BI0PWA026041; Fri, 11 Feb 2011 10:00:32 -0800 (PST) From: andros@netapp.com To: bhalevy@panasas.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 06/17] SQUASHME rename nfs_read_data call_ops THREE Date: Thu, 10 Feb 2011 20:52:39 -0500 Message-Id: <1297389170-26702-7-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1297389170-26702-6-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> <1297389170-26702-4-git-send-email-andros@netapp.com> <1297389170-26702-5-git-send-email-andros@netapp.com> <1297389170-26702-6-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:52 +0000 (UTC) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 61f21b6..36a797a 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -208,14 +208,14 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data) } /* Note this may cause RPC to be resent */ - rdata->call_ops->rpc_call_done(task, data); + rdata->mds_ops->rpc_call_done(task, data); } static void filelayout_read_release(void *data) { struct nfs_read_data *rdata = (struct nfs_read_data *)data; - rdata->call_ops->rpc_release(data); + rdata->mds_ops->rpc_release(data); } struct rpc_call_ops filelayout_read_call_ops = {