From e6b1a3c8a324a68f2003de910423098a29b3b398 Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Thu, 6 Jan 2011 11:36:19 +0000
Subject: [PATCH] --- yaml --- r: 229225 b: refs/heads/master c:
 daaa82d1c72e10dc16cad3a810e225f9188dc7aa h: refs/heads/master i:   229223:
 66731325f1a48aeef42beadf57ccd661eeefaf97 v: v3

---
 [refs]                        | 2 +-
 trunk/fs/nfs/nfs4proc.c       | 3 +--
 trunk/include/linux/nfs_xdr.h | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 58f9c25f3b35..3312d8f36459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52fabd73199cd00932f92c9f548bdf66a5bbc23d
+refs/heads/master: daaa82d1c72e10dc16cad3a810e225f9188dc7aa
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 18a4d5a9a4e9..28e175e74de2 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -5326,7 +5326,6 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
 			return;
 		}
 	}
-	lgp->status = task->tk_status;
 	dprintk("<-- %s\n", __func__);
 }
 
@@ -5382,7 +5381,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/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h
index 236e7e4b99a0..8fcc54267bba 100644
--- a/trunk/include/linux/nfs_xdr.h
+++ b/trunk/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 {