summaryrefslogtreecommitdiffstats
path: root/fs/nfs/filelayout
diff options
context:
space:
mode:
authorWeston Andros Adamson2017-03-09 18:56:49 +0100
committerAnna Schumaker2017-03-17 21:07:17 +0100
commitda066f3f039eba3e72e97b2ccad0dd8b45ba84bd (patch)
tree9d4c5082fab8a1d2d31cf5953db7bd766822276d /fs/nfs/filelayout
parentpNFS: return status from nfs4_pnfs_ds_connect (diff)
downloadkernel-qcow2-linux-da066f3f039eba3e72e97b2ccad0dd8b45ba84bd.tar.gz
kernel-qcow2-linux-da066f3f039eba3e72e97b2ccad0dd8b45ba84bd.tar.xz
kernel-qcow2-linux-da066f3f039eba3e72e97b2ccad0dd8b45ba84bd.zip
pNFS/flexfiles: never nfs4_mark_deviceid_unavailable
The flexfiles layout should never mark a device unavailable. Move nfs4_mark_deviceid_unavailable out of nfs4_pnfs_ds_connect and call directly from files layout where it's still needed. The flexfiles driver still handles marked devices in error paths, but will now print a rate limited warning. Signed-off-by: Weston Andros Adamson <dros@primarydata.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/filelayout')
-rw-r--r--fs/nfs/filelayout/filelayoutdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c
index 188120626179..d913e818858f 100644
--- a/fs/nfs/filelayout/filelayoutdev.c
+++ b/fs/nfs/filelayout/filelayoutdev.c
@@ -282,6 +282,7 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx)
dataserver_retrans, 4,
s->nfs_client->cl_minorversion);
if (status) {
+ nfs4_mark_deviceid_unavailable(devid);
ret = NULL;
goto out;
}