commit baf6c2a44af02cf6f7cec1ff177189c78fc30f9a
author Andy Adamson <andros@netapp.com> Wed Jun 20 15:03:32 2012 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Mon Jul 16 14:37:00 2012 -0400
tree 382cd1db99147f3b3b29b044bac27d9a8dde1c98
parent 82c7c7a5a9270b13380a588dc57b7541a5e4f541

NFSv4.1 don't send LAYOUTCOMMIT if data resent through MDS

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

fs/nfs/nfs4filelayout.c

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 26b96de..53f94d9 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -206,6 +206,7 @@
 		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);