summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4filelayout.c
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2012-06-20 21:03:31 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-16 20:36:52 +0200
commit82c7c7a5a9270b13380a588dc57b7541a5e4f541 (patch)
tree20b38256e4ef38d34b2b291d3cdcfa322cfa0218 /fs/nfs/nfs4filelayout.c
parentMerge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6 (diff)
downloadlinux-82c7c7a5a9270b13380a588dc57b7541a5e4f541.tar.xz
linux-82c7c7a5a9270b13380a588dc57b7541a5e4f541.zip
NFSv4.1 return the LAYOUT for each file with failed DS connection I/O
First mark the deviceid invalid to prevent any future use. Then fence all files involved in I/O to a DS with a connection error by sending a LAYOUTRETURN. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r--fs/nfs/nfs4filelayout.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 85b70639921b..26b96de831ea 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -205,9 +205,8 @@ static int filelayout_async_handle_error(struct rpc_task *task,
case -EPIPE:
dprintk("%s DS connection error %d\n", __func__,
task->tk_status);
- if (!filelayout_test_devid_invalid(devid))
- _pnfs_return_layout(inode);
filelayout_mark_devid_invalid(devid);
+ _pnfs_return_layout(inode);
rpc_wake_up(&tbl->slot_tbl_waitq);
nfs4_ds_disconnect(clp);
/* fall through */