diff options
| author | Jeremy Filizetti <jeremy.filizetti@gmail.com> | 2017-01-29 01:04:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-03 13:01:37 +0100 |
| commit | 8a140b45e4ad63377f9a1753a38613252ee6092a (patch) | |
| tree | 6ecf21bf91599d53cb57a98594e0a8a36933c8d7 /drivers | |
| parent | staging: lustre: ptlrpc: set proper mbits for EINPROGRESS resend (diff) | |
| download | linux-8a140b45e4ad63377f9a1753a38613252ee6092a.tar.xz linux-8a140b45e4ad63377f9a1753a38613252ee6092a.zip | |
staging: lustre: ldlm: Restore connect flags on failure
Restore connect flags on failure of ptlrpc_connect_import()
to prevent an LBUG due to flags mismatch.
Signed-off-by: Jeremy Filizetti <jeremy.filizetti@gmail.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7185
Reviewed-on: http://review.whamcloud.com/16950
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Sebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c index 95b8c76f70d0..3663c5cdb051 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c @@ -523,6 +523,8 @@ int client_connect_import(const struct lu_env *env, rc = ptlrpc_connect_import(imp); if (rc != 0) { + if (data && is_mdc) + data->ocd_connect_flags &= ~OBD_CONNECT_MULTIMODRPCS; LASSERT(imp->imp_state == LUSTRE_IMP_DISCON); goto out_ldlm; } |