Skip to content

Commit 6212e45

Browse files
Alexander Aringteigland
authored andcommitted
dlm: fix no ack after final message
In case of an final DLM message we can't should not send an ack out after the final message. This patch moves the ack message before the messages will be transmitted. If it's the final message and the receiving node turns into DLM_CLOSED state another ack messages will being received and turning the receiving node into DLM_ESTABLISHED again. Fixes: 1696c75 ("fs: dlm: add send ack threshold and append acks to msgs") Signed-off-by: Alexander Aring <[email protected]> Signed-off-by: David Teigland <[email protected]>
1 parent e759eb3 commit 6212e45

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

fs/dlm/midcomms.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,15 +1038,15 @@ struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,
10381038

10391039
break;
10401040
case DLM_VERSION_3_2:
1041+
/* send ack back if necessary */
1042+
dlm_send_ack_threshold(node, DLM_SEND_ACK_BACK_MSG_THRESHOLD);
1043+
10411044
msg = dlm_midcomms_get_msg_3_2(mh, nodeid, len, allocation,
10421045
ppc);
10431046
if (!msg) {
10441047
dlm_free_mhandle(mh);
10451048
goto err;
10461049
}
1047-
1048-
/* send ack back if necessary */
1049-
dlm_send_ack_threshold(node, DLM_SEND_ACK_BACK_MSG_THRESHOLD);
10501050
break;
10511051
default:
10521052
dlm_free_mhandle(mh);

0 commit comments

Comments
 (0)