]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
NFSv4.1: nfs4_fl_prepare_ds must be careful about reporting success.
authorNeilBrown <neilb@suse.com>
Mon, 19 Dec 2016 00:19:31 +0000 (11:19 +1100)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:46:55 +0000 (00:46 +0200)
commitc242797afd5ce0c22ee6c3d16851d64635a04419
tree483e4d0471c5dc146db1fc5e4d926699da5a51aa
parent0954c87c16bab5579b8c111887aafb6a75a17c0b
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>
fs/nfs/nfs4filelayoutdev.c