Unverified Commit 9f989f73 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10424 kunit: Fix kthread reference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MAFADP4URFVB4SGIPVIXKR6MRTFPSYYQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SDW 
 
Link:https://gitee.com/openeuler/kernel/pulls/10424

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ec8c5f98 c8dc8e53

lib/kunit/try-catch.c

+6 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/completion.h>

#include <linux/kernel.h>

#include <linux/kthread.h>

#include <linux/sched/task.h>



#include "try-catch-impl.h"
@@ -65,13 +66,14 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) 
	try_catch->context = context;

	try_catch->try_completion = &try_completion;

	try_catch->try_result = 0;

	task_struct = kthread_run(kunit_generic_run_threadfn_adapter,

				  try_catch,

				  "kunit_try_catch_thread");

	task_struct = kthread_create(kunit_generic_run_threadfn_adapter,

				     try_catch, "kunit_try_catch_thread");

	if (IS_ERR(task_struct)) {

		try_catch->catch(try_catch->context);

		return;

	}

	get_task_struct(task_struct);

	wake_up_process(task_struct);



	time_remaining = wait_for_completion_timeout(&try_completion,

						     kunit_test_timeout());
@@ -81,6 +83,7 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) 
		kthread_stop(task_struct);

	}



	put_task_struct(task_struct);

	exit_code = try_catch->try_result;



	if (!exit_code)