From ef7ef015eb333c8954d7165d216ec0c774d7e4e4 Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Thu, 12 Jan 2023 17:18:48 -0500 Subject: fs: dlm: move state change into else branch Currently we can switch at first into DLM_CLOSE_WAIT state and then do another state change if a condition is true. Instead of doing two state changes we handle the other state change inside an else branch of this condition. Signed-off-by: Alexander Aring Signed-off-by: David Teigland --- fs/dlm/midcomms.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fs/dlm') diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c index 7827d049378c..69e6f4705ebc 100644 --- a/fs/dlm/midcomms.c +++ b/fs/dlm/midcomms.c @@ -506,9 +506,6 @@ static void dlm_midcomms_receive_buffer(union dlm_packet *p, case DLM_ESTABLISHED: dlm_send_ack(node->nodeid, node->seq_next); - node->state = DLM_CLOSE_WAIT; - pr_debug("switch node %d to state %s\n", - node->nodeid, dlm_state_str(node->state)); /* passive shutdown DLM_LAST_ACK case 1 * additional we check if the node is used by * cluster manager events at all. @@ -519,6 +516,10 @@ static void dlm_midcomms_receive_buffer(union dlm_packet *p, node->nodeid, dlm_state_str(node->state)); set_bit(DLM_NODE_FLAG_STOP_RX, &node->flags); dlm_send_fin(node, dlm_pas_fin_ack_rcv); + } else { + node->state = DLM_CLOSE_WAIT; + pr_debug("switch node %d to state %s\n", + node->nodeid, dlm_state_str(node->state)); } break; case DLM_FIN_WAIT1: -- cgit v1.2.3