Commit 15c63db8 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: don't set stop rx flag after node reset 



Similar to the stop tx flag, the rx flag should warn about a dlm message
being received at DLM_FIN state change, when we are assuming no other
dlm application messages. If we receive a FIN message and we are in the
state DLM_FIN_WAIT2 we call midcomms_node_reset() which puts the
midcomms node into DLM_CLOSED state. Afterwards we should not set the
DLM_NODE_FLAG_STOP_RX flag any more.  This patch changes the setting
DLM_NODE_FLAG_STOP_RX in those state changes when we receive a FIN
message and we assume there will be no other dlm application messages
received until we hit DLM_CLOSED state.

Cc: stable@vger.kernel.org
Fixes: 489d8e55 ("fs: dlm: add reliable connection if reconnect")
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 16427211

fs/dlm/midcomms.c

+1 −2
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ static void dlm_midcomms_receive_buffer(union dlm_packet *p, 
				break;

			case DLM_FIN_WAIT1:

				node->state = DLM_CLOSING;

				set_bit(DLM_NODE_FLAG_STOP_RX, &node->flags);

				pr_debug("switch node %d to state %s\n",

					 node->nodeid, dlm_state_str(node->state));

				break;
@@ -544,8 +545,6 @@ static void dlm_midcomms_receive_buffer(union dlm_packet *p, 
				return;

			}

			spin_unlock(&node->state_lock);



			set_bit(DLM_NODE_FLAG_STOP_RX, &node->flags);

			break;

		default:

			WARN_ON_ONCE(test_bit(DLM_NODE_FLAG_STOP_RX, &node->flags));