From 512d79a65bb4b7ddf5c83ea11f91ab4384543987 Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@netapp.com>
Date: Wed, 20 Jun 2012 15:03:32 -0400
Subject: [PATCH] --- yaml --- r: 320214 b: refs/heads/master c:
 baf6c2a44af02cf6f7cec1ff177189c78fc30f9a h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/nfs/nfs4filelayout.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 68461a13917b..82e3560dd573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82c7c7a5a9270b13380a588dc57b7541a5e4f541
+refs/heads/master: baf6c2a44af02cf6f7cec1ff177189c78fc30f9a
diff --git a/trunk/fs/nfs/nfs4filelayout.c b/trunk/fs/nfs/nfs4filelayout.c
index 26b96de831ea..53f94d915bd1 100644
--- a/trunk/fs/nfs/nfs4filelayout.c
+++ b/trunk/fs/nfs/nfs4filelayout.c
@@ -206,6 +206,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,
 		dprintk("%s DS connection error %d\n", __func__,
 			task->tk_status);
 		filelayout_mark_devid_invalid(devid);
+		clear_bit(NFS_INO_LAYOUTCOMMIT, &NFS_I(inode)->flags);
 		_pnfs_return_layout(inode);
 		rpc_wake_up(&tbl->slot_tbl_waitq);
 		nfs4_ds_disconnect(clp);