summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2012-06-20 21:03:32 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-16 20:37:00 +0200
commitbaf6c2a44af02cf6f7cec1ff177189c78fc30f9a (patch)
tree382cd1db99147f3b3b29b044bac27d9a8dde1c98 /fs
parentNFSv4.1 return the LAYOUT for each file with failed DS connection I/O (diff)
downloadlinux-baf6c2a44af02cf6f7cec1ff177189c78fc30f9a.tar.xz
linux-baf6c2a44af02cf6f7cec1ff177189c78fc30f9a.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4filelayout.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 26b96de831ea..53f94d915bd1 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/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);