Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm (d40b0c34) · Commits · e / devices / android_kernel_fairphone_FP5

fs/dlm/lowcomms.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1468,15 +1468,13 @@ static void work_stop(void)

	static int work_start(void)		static int work_start(void)
	{		{
	recv_workqueue = alloc_workqueue("dlm_recv", WQ_MEM_RECLAIM \|		recv_workqueue = create_singlethread_workqueue("dlm_recv");
	WQ_HIGHPRI \| WQ_FREEZEABLE, 0);
	if (!recv_workqueue) {		if (!recv_workqueue) {
	log_print("can't start dlm_recv");		log_print("can't start dlm_recv");
	return -ENOMEM;		return -ENOMEM;
	}		}

	send_workqueue = alloc_workqueue("dlm_send", WQ_MEM_RECLAIM \|		send_workqueue = create_singlethread_workqueue("dlm_send");
	WQ_HIGHPRI \| WQ_FREEZEABLE, 0);
	if (!send_workqueue) {		if (!send_workqueue) {
	log_print("can't start dlm_send");		log_print("can't start dlm_send");
	destroy_workqueue(recv_workqueue);		destroy_workqueue(recv_workqueue);