diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index f15ca6fc400d..9e95b0255bfe 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2671,7 +2671,7 @@ static int nilfs_segctor_thread(void *arg)
 		}
 
 		prepare_to_wait(&sci->sc_wait_daemon, &wait,
-				TASK_INTERRUPTIBLE);
+				TASK_UNINTERRUPTIBLE);
 		should_write = nilfs_log_write_required(sci, &mode);
 		if (!should_write)
 			schedule();
@@ -2808,6 +2808,10 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)
 
 	down_write(&nilfs->ns_segctor_sem);
 
+	if (sci->sc_task) {
+		printk("!!! sci %p sctask %p %s\n", sci, sci->sc_task, __func__);
+		//timer_shutdown_sync(&sci->sc_timer);
+	}
 	kfree(sci);
 }