exit: Rename complete_and_exit to kthread_complete_and_exit

Update complete_and_exit to call kthread_exit instead of do_exit.

Change the name to reflect this change in functionality.  All of the
users of complete_and_exit are causing the current kthread to exit so
this change makes it clear what is happening.

Move the implementation of kthread_complete_and_exit from
kernel/exit.c to to kernel/kthread.c.  As this function is kthread
specific it makes most sense to live with the kthread functions.

There are no functional change.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/drivers/net/wireless/rsi/rsi_91x_coex.c b/drivers/net/wireless/rsi/rsi_91x_coex.c
index a0c5d02ae88cf8486a862e1338062e966d9565ed..8a3d86897ea8ec8b3fa9e1973ae4d17a427ded32 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_coex.c
+++ b/drivers/net/wireless/rsi/rsi_91x_coex.c
@@ -63,7 +63,7 @@ static void rsi_coex_scheduler_thread(struct rsi_common *common)
                rsi_coex_sched_tx_pkts(coex_cb);
        } while (atomic_read(&coex_cb->coex_tx_thread.thread_done) == 0);
 
-       complete_and_exit(&coex_cb->coex_tx_thread.completion, 0);
+       kthread_complete_and_exit(&coex_cb->coex_tx_thread.completion, 0);
 }
 
 int rsi_coex_recv_pkt(struct rsi_common *common, u8 *msg)

diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c
index f1bf71e6c6081e7fb00a16e13317c0fa224c8bcd..c7f5cec5e446c744aa906e6cf076df141a6a6603 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_main.c
+++ b/drivers/net/wireless/rsi/rsi_91x_main.c
@@ -260,7 +260,7 @@ static void rsi_tx_scheduler_thread(struct rsi_common *common)
                if (common->init_done)
                        rsi_core_qos_processor(common);
        } while (atomic_read(&common->tx_thread.thread_done) == 0);
-       complete_and_exit(&common->tx_thread.completion, 0);
+       kthread_complete_and_exit(&common->tx_thread.completion, 0);
 }
 
 #ifdef CONFIG_RSI_COEX

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
index 8ace1874e5cb1fe83cb65f58a37dd3b584cd4602..b2b47a0abcbf1c2da43f6b3769e133f37b9ccce2 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
@@ -75,7 +75,7 @@ void rsi_sdio_rx_thread(struct rsi_common *common)
 
        rsi_dbg(INFO_ZONE, "%s: Terminated SDIO RX thread\n", __func__);
        atomic_inc(&sdev->rx_thread.thread_done);
-       complete_and_exit(&sdev->rx_thread.completion, 0);
+       kthread_complete_and_exit(&sdev->rx_thread.completion, 0);
 }
 
 /**

diff --git a/drivers/net/wireless/rsi/rsi_91x_usb_ops.c b/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
index 4ffcdde1acb1e3ba7f58582180349ffe52b3faef..5130b0e72adcf1c007a565c81548988e945f12c7 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb_ops.c
@@ -56,6 +56,6 @@ void rsi_usb_rx_thread(struct rsi_common *common)
 out:
        rsi_dbg(INFO_ZONE, "%s: Terminated thread\n", __func__);
        skb_queue_purge(&dev->rx_q);
-       complete_and_exit(&dev->rx_thread.completion, 0);
+       kthread_complete_and_exit(&dev->rx_thread.completion, 0);
 }
 

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 669ef4700c1ac2bdb9c94ac5f4300d4354f70ea7..f7e86ae9f72faa58d3da8443bad09c4a6ddf714f 100644 (file)
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -160,7 +160,7 @@ static int pnp_dock_thread(void *unused)
                         * No dock to manage
                         */
                case PNP_FUNCTION_NOT_SUPPORTED:
-                       complete_and_exit(&unload_sem, 0);
+                       kthread_complete_and_exit(&unload_sem, 0);
                case PNP_SYSTEM_NOT_DOCKED:
                        d = 0;
                        break;
@@ -170,7 +170,7 @@ static int pnp_dock_thread(void *unused)
                default:
                        pnpbios_print_status("pnp_dock_thread", status);
                        printk(KERN_WARNING "PnPBIOS: disabling dock monitoring.\n");
-                       complete_and_exit(&unload_sem, 0);
+                       kthread_complete_and_exit(&unload_sem, 0);
                }
                if (d != docked) {
                        if (pnp_dock_event(d, &now) == 0) {
@@ -183,7 +183,7 @@ static int pnp_dock_thread(void *unused)
                        }
                }
        }
-       complete_and_exit(&unload_sem, 0);
+       kthread_complete_and_exit(&unload_sem, 0);
 }
 
 static int pnpbios_get_resources(struct pnp_dev *dev)

diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index 91fcf85e150a444c1d3f393e57fc80eea76b9208..5a58dac76c88f164b56f11533fee050c9041fb6c 100644 (file)
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -450,13 +450,13 @@ skip_for_abort:
         * after the down() -- that's necessary for the thread-shutdown
         * case.
         *
-        * complete_and_exit() goes even further than this -- it is safe in
-        * the case that the thread of the caller is going away (not just
-        * the structure) -- this is necessary for the module-remove case.
-        * This is important in preemption kernels, which transfer the flow
-        * of execution immediately upon a complete().
+        * kthread_complete_and_exit() goes even further than this --
+        * it is safe in the case that the thread of the caller is going away
+        * (not just the structure) -- this is necessary for the module-remove
+        * case.  This is important in preemption kernels, which transfer the
+        * flow of execution immediately upon a complete().
         */
-       complete_and_exit(&dev->control_exit, 0);
+       kthread_complete_and_exit(&dev->control_exit, 0);
 }
 
 static int rtsx_polling_thread(void *__dev)
@@ -501,7 +501,7 @@ static int rtsx_polling_thread(void *__dev)
                mutex_unlock(&dev->dev_mutex);
        }
 
-       complete_and_exit(&dev->polling_exit, 0);
+       kthread_complete_and_exit(&dev->polling_exit, 0);
 }
 
 /*
@@ -682,7 +682,7 @@ static int rtsx_scan_thread(void *__dev)
                /* Should we unbind if no devices were detected? */
        }
 
-       complete_and_exit(&dev->scanning_done, 0);
+       kthread_complete_and_exit(&dev->scanning_done, 0);
 }
 
 static void rtsx_init_options(struct rtsx_chip *chip)

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index da17be1ef64e277c387efe1abf8112638e7d76e6..e3a49d837609dd0bf5cbe6a512375eda0122fcc8 100644 (file)
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -969,7 +969,7 @@ static int usbatm_do_heavy_init(void *arg)
        instance->thread = NULL;
        mutex_unlock(&instance->serialize);
 
-       complete_and_exit(&instance->thread_exited, ret);
+       kthread_complete_and_exit(&instance->thread_exited, ret);
 }
 
 static int usbatm_heavy_init(struct usbatm_data *instance)

diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 752439690fda1c5e6abd86aaf32183e87cd85223..46dd11dcb3a8a6669ae22527f460ee875859b764 100644 (file)
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -2547,7 +2547,7 @@ static int fsg_main_thread(void *common_)
        up_write(&common->filesem);
 
        /* Let fsg_unbind() know the thread has exited */
-       complete_and_exit(&common->thread_notifier, 0);
+       kthread_complete_and_exit(&common->thread_notifier, 0);
 }
 
 

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 2b4d5013dc5d0b48a38514ca602169ea1cdc7274..6da92ecaf66d393a1d7b92eb47c3ce7123e5e617 100644 (file)
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -161,5 +161,5 @@ static int jffs2_garbage_collect_thread(void *_c)
        spin_lock(&c->erase_completion_lock);
        c->gc_task = NULL;
        spin_unlock(&c->erase_completion_lock);
-       complete_and_exit(&c->gc_thread_exit, 0);
+       kthread_complete_and_exit(&c->gc_thread_exit, 0);
 }

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 77755ac3e189bfa23255bbba4e5c48f4fd8a65f2..055eb203c00e4e48fe55e10082d8221da3d0aa88 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -187,7 +187,6 @@ static inline void might_fault(void) { }
 #endif
 
 void do_exit(long error_code) __noreturn;
-void complete_and_exit(struct completion *, long) __noreturn;
 
 extern int num_to_str(char *buf, int size,
                      unsigned long long num, unsigned int width);

diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 22c43d41968709dd8bc6e7f92b834c5fa280754c..d86a7e3b9a52100d5f28a2816b664d0f80b58677 100644 (file)
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -71,6 +71,7 @@ int kthread_park(struct task_struct *k);
 void kthread_unpark(struct task_struct *k);
 void kthread_parkme(void);
 void kthread_exit(long result) __noreturn;
+void kthread_complete_and_exit(struct completion *, long) __noreturn;
 
 int kthreadd(void *unused);
 extern struct task_struct *kthreadd_task;

diff --git a/kernel/exit.c b/kernel/exit.c
index 57afac845a0ac9278f6428a2cc2aaf824f196482..6c4b04531f179d2ca7b901dec0d5e68ef873ae34 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -891,15 +891,6 @@ void __noreturn make_task_dead(int signr)
        do_exit(signr);
 }
 
-void complete_and_exit(struct completion *comp, long code)
-{
-       if (comp)
-               complete(comp);
-
-       do_exit(code);
-}
-EXPORT_SYMBOL(complete_and_exit);
-
 SYSCALL_DEFINE1(exit, int, error_code)
 {
        do_exit((error_code&0xff)<<8);

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 77b7c3f23f1806761ca996983b6f960f5b3b288f..4388d6694a7fd7cdbfe8146d45fd399d12681631 100644 (file)
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -283,6 +283,27 @@ void __noreturn kthread_exit(long result)
        do_exit(result);
 }
 
+/**
+ * kthread_complete_and exit - Exit the current kthread.
+ * @comp: Completion to complete
+ * @code: The integer value to return to kthread_stop().
+ *
+ * If present complete @comp and the reuturn code to kthread_stop().
+ *
+ * A kernel thread whose module may be removed after the completion of
+ * @comp can use this function exit safely.
+ *
+ * Does not return.
+ */
+void __noreturn kthread_complete_and_exit(struct completion *comp, long code)
+{
+       if (comp)
+               complete(comp);
+
+       kthread_exit(code);
+}
+EXPORT_SYMBOL(kthread_complete_and_exit);
+
 static int kthread(void *_create)
 {
        static const struct sched_param param = { .sched_priority = 0 };

diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
index 0dd434e40487cf9ef032932369280fc3300520ad..be38a2c5ecc2b2ec08546baa4e27f3f3666cca19 100644 (file)
--- a/lib/kunit/try-catch.c
+++ b/lib/kunit/try-catch.c
@@ -17,7 +17,7 @@
 void __noreturn kunit_try_catch_throw(struct kunit_try_catch *try_catch)
 {
        try_catch->try_result = -EFAULT;
-       complete_and_exit(try_catch->try_completion, -EFAULT);
+       kthread_complete_and_exit(try_catch->try_completion, -EFAULT);
 }
 EXPORT_SYMBOL_GPL(kunit_try_catch_throw);
 
@@ -27,7 +27,7 @@ static int kunit_generic_run_threadfn_adapter(void *data)
 
        try_catch->try(try_catch->context);
 
-       complete_and_exit(try_catch->try_completion, 0);
+       kthread_complete_and_exit(try_catch->try_completion, 0);
 }
 
 static unsigned long kunit_test_timeout(void)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 120e9598c11a5478def595c0b757c1ba989efec1..282273a1ffa51cce753b356c51a7f4290fe22ccb 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -171,7 +171,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
                "kthread_exit",
                "make_task_dead",
                "__module_put_and_kthread_exit",
-               "complete_and_exit",
+               "kthread_complete_and_exit",
                "__reiserfs_panic",
                "lbug_with_loc",
                "fortify_panic",