OSDN Git Service

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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jan 2017 19:18:05 +0000 (20:18 +0100)
commit396b25173370fc1afa3bc91a315d5597c2b10734
tree60963c5e404109cb54353ee4b7fc81afa962d2a5
parente331f2f2b1fbb5157dfb4f0a977bc8c3737e5927
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/filelayout/filelayoutdev.c