diff options
| author | NeilBrown <neilb@suse.com> | 2016-12-19 11:19:31 +1100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-06-17 15:49:59 +0200 |
| commit | 7690890952bd8da51515900b18931ac0db7ebeb7 (patch) | |
| tree | 7e803da7449477f61bc012808af92d2ede851e34 /fs/nfs | |
| parent | ab7f56c4cb4a4328e4275a8db2d0e5e7ae697d67 (diff) | |
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: c23266d532b4 ("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: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4filelayoutdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index 678cb8964..b906d8e55 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -821,7 +821,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) nfs4_wait_ds_connect(ds); } out_test_devid: - if (filelayout_test_devid_unavailable(devid)) + if (ret->ds_clp == NULL || + filelayout_test_devid_unavailable(devid)) ret = NULL; out: return ret; |