import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / jfs / jfs_txnmgr.c

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 5fcc02eaa64ca2af23ba4bba6431647fa04deb4e..916d8e1da529dc75f98ec1b0603da409dac52e83 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -2752,6 +2752,8 @@ int jfs_lazycommit(void *arg)
        unsigned long flags;
        struct jfs_sb_info *sbi;
 
+       set_freezable();
+
        do {
                LAZY_LOCK(flags);
                jfs_commit_thread_waking = 0;   /* OK to wake another thread */
@@ -2811,7 +2813,7 @@ int jfs_lazycommit(void *arg)
                        __set_current_state(TASK_RUNNING);
                        remove_wait_queue(&jfs_commit_thread_wait, &wq);
                }
-       } while (!kthread_should_stop());
+       } while (!kthread_freezable_should_stop(NULL));
 
        if (!list_empty(&TxAnchor.unlock_queue))
                jfs_err("jfs_lazycommit being killed w/pending transactions!");
@@ -2936,6 +2938,8 @@ int jfs_sync(void *arg)
        struct jfs_inode_info *jfs_ip;
        tid_t tid;
 
+       set_freezable();
+
        do {
                /*
                 * write each inode on the anonymous inode list
@@ -2998,7 +3002,7 @@ int jfs_sync(void *arg)
                        schedule();
                        __set_current_state(TASK_RUNNING);
                }
-       } while (!kthread_should_stop());
+       } while (!kthread_freezable_should_stop(NULL));
 
        jfs_info("jfs_sync being killed");
        return 0;