From: Trond Myklebust Date: Thu, 20 Apr 2017 18:33:06 +0000 (-0400) Subject: pNFS/flexfiles: Check the result of nfs4_pnfs_ds_connect X-Git-Tag: v4.12-rc1~32^2~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=260f32adb88dadfaac29f47f761a088238ca164c;p=thirdparty%2Fkernel%2Flinux.git pNFS/flexfiles: Check the result of nfs4_pnfs_ds_connect The check in nfs4_ff_layout_prepare_ds() seems to be missing. Signed-off-by: Trond Myklebust Fixes: a33e4b036d461 ("pNFS: return status from nfs4_pnfs_ds_connect") Cc: Weston Andros Adamson Cc: stable@vger.kernel.org # v4.11 --- diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index 8ca9cc6655613..6df7a0cf56601 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -421,7 +421,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, mirror->mirror_ds->ds_versions[0].minor_version); /* connect success, check rsize/wsize limit */ - if (ds->ds_clp) { + if (!status) { max_payload = nfs_block_size(rpc_max_payload(ds->ds_clp->cl_rpcclient), NULL);