From 7d1df4a61875f34e8a572e53216cdec6a264a156 Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@netapp.com>
Date: Tue, 22 May 2012 08:09:27 -0400
Subject: [PATCH] --- yaml --- r: 308639 b: refs/heads/master c:
 bd4aeffb5b89070ae93c579f1d5a0758f7123e8b h: refs/heads/master i:   308637:
 93f675773cc4a457d90849a30c4df19439167913   308635:
 94b3faf0f99de097c283e9d047421190b2adcbe3   308631:
 602a019eb63e02edec8edef401cd7b8bcd09780f   308623:
 fac95a4a3b28691083fc9bff9e860dc36991846b   308607:
 1b9db5b3858b6e3c4bffef8d9fdf2a9d46e6265b v: v3

---
 [refs]                        | 2 +-
 trunk/fs/nfs/nfs4filelayout.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47609c08a5c2..7254f9945f73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 996074cb8c355bf3d87d066ba1e1189ba3f648f5
+refs/heads/master: bd4aeffb5b89070ae93c579f1d5a0758f7123e8b
diff --git a/trunk/fs/nfs/nfs4filelayout.c b/trunk/fs/nfs/nfs4filelayout.c
index 466284793119..56aa0ec1b169 100644
--- a/trunk/fs/nfs/nfs4filelayout.c
+++ b/trunk/fs/nfs/nfs4filelayout.c
@@ -302,7 +302,8 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)
 
 	dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);
 
-	if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags))
+	if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) &&
+	    task->tk_status == 0)
 		return;
 
 	/* Note this may cause RPC to be resent */
@@ -399,7 +400,8 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data)
 {
 	struct nfs_write_data *wdata = data;
 
-	if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags))
+	if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
+	    task->tk_status == 0)
 		return;
 
 	/* Note this may cause RPC to be resent */