Skip to content

Commit 33ebdfe

Browse files
NeilBrowngregkh
authored andcommitted
NFSv4.1: nfs4_fl_prepare_ds must be careful about reporting success.
commit cfd278c280f997cf2fe4662e0acab0fe465f637b upstream. Various places assume that if nfs4_fl_prepare_ds() turns a non-NULL 'ds', then ds->ds_clp will also be non-NULL. This is not necessasrily true in the case when the process received a fatal signal while nfs4_pnfs_ds_connect is waiting in nfs4_wait_ds_connect(). In that case ->ds_clp may not be set, and the devid may not recently have been marked unavailable. So add a test for ds_clp == NULL and return NULL in that case. Fixes: c23266d ("NFS4.1 Fix data server connection race") Signed-off-by: NeilBrown <neilb@suse.com> Acked-by: Olga Kornievskaia <aglo@umich.edu> Acked-by: Adamson, Andy <William.Adamson@netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1180423 commit 33ebdfe

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

fs/nfs/filelayout/filelayoutdev.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx)
283283
s->nfs_client->cl_rpcclient->cl_auth->au_flavor);
284284

285285
out_test_devid:
286-
if (filelayout_test_devid_unavailable(devid))
286+
if (ret->ds_clp == NULL ||
287+
filelayout_test_devid_unavailable(devid))
287288
ret = NULL;
288289
out:
289290
return ret;

0 commit comments

Comments
 (0)