diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:41 +0800 |
| commit | 261e8dbdb94baf294d0c8d45de843bb3d928c90e (patch) | |
| tree | 43e9e62c40fd1776ac8763e711bafe14839de724 /fs/nfs/filelayout/filelayoutdev.c | |
| parent | 75dd1c226c98dc1b4ad1bcf78746f4843c3fa1c4 (diff) | |
| parent | a7dd347a67c0ee738dda3c421d82ce8414be8c38 (diff) | |
Merge tag 'v4.4.44' into linux-linaro-lsk-v4.4
This is the 4.4.44 stable release
Diffstat (limited to 'fs/nfs/filelayout/filelayoutdev.c')
| -rw-r--r-- | fs/nfs/filelayout/filelayoutdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c index 4946ef40ba87..85ef38f9765f 100644 --- a/fs/nfs/filelayout/filelayoutdev.c +++ b/fs/nfs/filelayout/filelayoutdev.c @@ -283,7 +283,8 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) s->nfs_client->cl_rpcclient->cl_auth->au_flavor); out_test_devid: - if (filelayout_test_devid_unavailable(devid)) + if (ret->ds_clp == NULL || + filelayout_test_devid_unavailable(devid)) ret = NULL; out: return ret; |