diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:43 +0800 |
| commit | b4bbeeb816c06fd59dea2ea82c7b5650eb185e65 (patch) | |
| tree | a9b57e3df7589fe3a8649c41eff9b49685b99aec /fs/nfs/filelayout/filelayoutdev.c | |
| parent | ee620ddd6581cf9779d27677f6f0f11e3f939a8c (diff) | |
| parent | 261e8dbdb94baf294d0c8d45de843bb3d928c90e (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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; |