pstore: Shut down worker when unregistering

[mirror_ubuntu-zesty-kernel.git] / fs / pstore / platform.c

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 729677e18e364fbff1d66e89fb93450d592f55e8..8e6ae68abf8dc4b21e8048c32874412ba9845e82 100644 (file)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -705,6 +705,7 @@ int pstore_register(struct pstore_info *psi)
        if (psi->flags & PSTORE_FLAGS_PMSG)
                pstore_register_pmsg();
 
+       /* Start watching for new records, if desired. */
        if (pstore_update_ms >= 0) {
                pstore_timer.expires = jiffies +
                        msecs_to_jiffies(pstore_update_ms);
@@ -727,6 +728,11 @@ EXPORT_SYMBOL_GPL(pstore_register);
 
 void pstore_unregister(struct pstore_info *psi)
 {
+       /* Stop timer and make sure all work has finished. */
+       pstore_update_ms = -1;
+       del_timer_sync(&pstore_timer);
+       flush_work(&pstore_work);
+
        if (psi->flags & PSTORE_FLAGS_PMSG)
                pstore_unregister_pmsg();
        if (psi->flags & PSTORE_FLAGS_FTRACE)
@@ -826,7 +832,9 @@ static void pstore_timefunc(unsigned long dummy)
                schedule_work(&pstore_work);
        }
 
-       mod_timer(&pstore_timer, jiffies + msecs_to_jiffies(pstore_update_ms));
+       if (pstore_update_ms >= 0)
+               mod_timer(&pstore_timer,
+                         jiffies + msecs_to_jiffies(pstore_update_ms));
 }
 
 module_param(backend, charp, 0444);