fs: dlm: ignore unexpected non dlm opts msgs

This patch ignores unexpected RCOM_NAMES/RCOM_STATUS messages.
To be backwards compatible, those messages are not part of the new
reliable DLM OPTS encapsulation header, and have their own
retransmit handling using sequence number matching  When we get
unexpected non dlm opts messages, we should allow them and let
RCOM message handling filter them out using sequence numbers.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c
index ecd81018d1cfbdd6c271cb7d390fcbf433c09125..dbc998b2748bd2a4027d4e62aba14a96edbd79b6 100644 (file)
--- a/fs/dlm/midcomms.c
+++ b/fs/dlm/midcomms.c
@@ -606,16 +606,8 @@ dlm_midcomms_recv_node_lookup(int nodeid, const union dlm_packet *p,
                                case DLM_ESTABLISHED:
                                        break;
                                default:
-                                       /* some invalid state passive shutdown
-                                        * was failed, we try to reset and
-                                        * hope it will go on.
-                                        */
-                                       log_print("reset node %d because shutdown stuck",
-                                                 node->nodeid);
-
-                                       midcomms_node_reset(node);
-                                       node->state = DLM_ESTABLISHED;
-                                       break;
+                                       spin_unlock(&node->state_lock);
+                                       return NULL;
                                }
                                spin_unlock(&node->state_lock);
                        }