exit/kthread: Have kernel threads return instead of calling do_exit

In 2009 Oleg reworked[1] the kernel threads so that it is not
necessary to call do_exit if you are not using kthread_stop().  Remove
the explicit calls of do_exit and complete_and_exit (with a NULL
completion) that were previously necessary.

[1] 63706172f332 ("kthreads: rework kthread_stop()")
Link: https://lkml.kernel.org/r/20211020174406.17889-12-ebiederm@xmission.com
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 2a7687911c097c964bed2444d45262441f2872e3..29c0a616b317744bcce9771078e1d76abfa206e5 100644 (file)
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -520,7 +520,7 @@ static int svc_normal_to_secure_thread(void *data)
  * physical address of memory block reserved by secure monitor software at
  * secure world.
  *
- * svc_normal_to_secure_shm_thread() calls do_exit() directly since it is a
+ * svc_normal_to_secure_shm_thread() terminates directly since it is a
  * standlone thread for which no one will call kthread_stop() or return when
  * 'kthread_should_stop()' is true.
  */
@@ -544,7 +544,7 @@ static int svc_normal_to_secure_shm_thread(void *data)
        }
 
        complete(&sh_mem->sync_complete);
-       do_exit(0);
+       return 0;
 }
 
 /**

diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c
index 09abd17065ba58c6c5c0920a55eca48e29753bd5..0733443a26312ec3780d6e2ff573ee3f5a2ddcd1 100644 (file)
--- a/drivers/soc/ti/wkup_m3_ipc.c
+++ b/drivers/soc/ti/wkup_m3_ipc.c
@@ -426,7 +426,7 @@ static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc)
        else
                m3_ipc_state = m3_ipc;
 
-       do_exit(0);
+       return 0;
 }
 
 static int wkup_m3_ipc_probe(struct platform_device *pdev)

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 4f15750aac5d5415fc0be0e5b3826cc7531ad8d4..329986f12db32cc21fadf5984ca86b880552b0e4 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1497,10 +1497,7 @@ bail:
        if (quota_enabled)
                kfree(rm_quota);
 
-       /* no one is callint kthread_stop() for us so the kthread() api
-        * requires that we call do_exit().  And it isn't exported, but
-        * complete_and_exit() seems to be a minimal wrapper around it. */
-       complete_and_exit(NULL, status);
+       return status;
 }
 
 void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 5b37a8567168b37ae0d67087d75e49020f1986b0..33e17beaa682969cf33f8a71d57c3ccd29fa480f 100644 (file)
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -433,7 +433,7 @@ struct task_struct *__kthread_create_on_node(int (*threadfn)(void *data),
  * If thread is going to be bound on a particular cpu, give its node
  * in @node, to get NUMA affinity for kthread stack, or else give NUMA_NO_NODE.
  * When woken, the thread will run @threadfn() with @data as its
- * argument. @threadfn() can either call do_exit() directly if it is a
+ * argument. @threadfn() can either return directly if it is a
  * standalone thread for which no one will call kthread_stop(), or
  * return when 'kthread_should_stop()' is true (which means
  * kthread_stop() has been called).  The return value should be zero

diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 56b9fe97b3b44cc677c34ca44c859afd26815ed7..1252540cde17937029b0dedfc8fa507dc04afa49 100644 (file)
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -890,7 +890,7 @@ out:
 
        batadv_tp_vars_put(tp_vars);
 
-       do_exit(0);
+       return 0;
 }
 
 /**