Merge tag 'v3.10.69' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / nilfs2 / segment.c

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index b3c95c1a4700fbfb85f5a395fd2920b69bf0d96a..c7b726ca8c557a9078adb830147c6e6cd4ed688b 100644 (file)
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2470,6 +2470,8 @@ static int nilfs_segctor_thread(void *arg)
        struct the_nilfs *nilfs = sci->sc_super->s_fs_info;
        int timeout = 0;
 
+       set_freezable();
+
        sci->sc_timer.data = (unsigned long)current;
        sci->sc_timer.function = nilfs_construction_timeout;