From patchwork Thu Dec 23 12:47:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fred Isaman X-Patchwork-Id: 429431 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 oBNJ5f5O026223 for ; Thu, 23 Dec 2010 19:07:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753195Ab0LWMrz (ORCPT ); Thu, 23 Dec 2010 07:47:55 -0500 Received: from mx2.netapp.com ([216.240.18.37]:8992 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753136Ab0LWMry (ORCPT ); Thu, 23 Dec 2010 07:47:54 -0500 X-IronPort-AV: E=Sophos;i="4.60,219,1291622400"; d="scan'208";a="498257441" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 23 Dec 2010 04:47:52 -0800 Received: from localhost.localdomain (blake2-lxp.hq.netapp.com [10.58.56.182] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id oBNCloVW003857; Thu, 23 Dec 2010 04:47:52 -0800 (PST) From: Fred Isaman To: linux-nfs@vger.kernel.org Cc: Trond Myklebust Subject: [PATCH 02/15] pnfs: remove unnecessary field lgp->status Date: Thu, 23 Dec 2010 07:47:33 -0500 Message-Id: <1293108466-31768-3-git-send-email-iisaman@netapp.com> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1293108466-31768-1-git-send-email-iisaman@netapp.com> References: <1293108466-31768-1-git-send-email-iisaman@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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 23 Dec 2010 19:07:24 +0000 (UTC) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index fcf2658..f475516 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5330,7 +5330,6 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata) return; } } - lgp->status = task->tk_status; dprintk("<-- %s\n", __func__); } @@ -5386,7 +5385,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp) status = nfs4_wait_for_completion_rpc_task(task); if (status != 0) goto out; - status = lgp->status; + status = task->tk_status; if (status != 0) goto out; status = pnfs_layout_process(lgp); diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index d325def..f923831 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -223,7 +223,6 @@ struct nfs4_layoutget { struct nfs4_layoutget_args args; struct nfs4_layoutget_res res; struct pnfs_layout_segment **lsegpp; - int status; }; struct nfs4_getdeviceinfo_args {