These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / jffs2 / background.c

diff --git a/kernel/fs/jffs2/background.c b/kernel/fs/jffs2/background.c
index bb9cebc..e5c1783 100644 (file)
--- a/kernel/fs/jffs2/background.c
+++ b/kernel/fs/jffs2/background.c
@@ -80,7 +80,6 @@ static int jffs2_garbage_collect_thread(void *_c)
        siginitset(&hupmask, sigmask(SIGHUP));
        allow_signal(SIGKILL);
        allow_signal(SIGSTOP);
-       allow_signal(SIGCONT);
        allow_signal(SIGHUP);
 
        c->gc_task = current;
@@ -121,20 +120,18 @@ static int jffs2_garbage_collect_thread(void *_c)
                /* Put_super will send a SIGKILL and then wait on the sem.
                 */
                while (signal_pending(current) || freezing(current)) {
-                       siginfo_t info;
                        unsigned long signr;
 
                        if (try_to_freeze())
                                goto again;
 
-                       signr = dequeue_signal_lock(current, &current->blocked, &info);
+                       signr = kernel_dequeue_signal(NULL);
 
                        switch(signr) {
                        case SIGSTOP:
                                jffs2_dbg(1, "%s(): SIGSTOP received\n",
                                          __func__);
-                               set_current_state(TASK_STOPPED);
-                               schedule();
+                               kernel_signal_stop();
                                break;
 
                        case SIGKILL: