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

fs: dlm: start midcomms before scand 



The scand kthread can send dlm messages out, especially dlm remove
messages to free memory for unused rsb on other nodes. To send out dlm
messages, midcomms must be initialized. This patch moves the midcomms
start before scand is started.

Cc: stable@vger.kernel.org
Fixes: e7fd4179 ("[DLM] The core of the DLM for GFS2/CLVM")
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent aa7f4a21

fs/dlm/lockspace.c

+8 −8
Original line number Diff line number Diff line
@@ -381,23 +381,23 @@ static int threads_start(void) 
{

	int error;



	error = dlm_scand_start();

	/* Thread for sending/receiving messages for all lockspace's */

	error = dlm_midcomms_start();

	if (error) {

		log_print("cannot start dlm_scand thread %d", error);

		log_print("cannot start dlm midcomms %d", error);

		goto fail;

	}



	/* Thread for sending/receiving messages for all lockspace's */

	error = dlm_midcomms_start();

	error = dlm_scand_start();

	if (error) {

		log_print("cannot start dlm midcomms %d", error);

		goto scand_fail;

		log_print("cannot start dlm_scand thread %d", error);

		goto midcomms_fail;

	}



	return 0;



 scand_fail:

	dlm_scand_stop();

 midcomms_fail:

	dlm_midcomms_stop();

 fail:

	return error;

}