diff --git a/[refs] b/[refs]
index 8effaac435f8..915710df4d90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b05a1187bbf35035300313987cbd22e362d71dc6
+refs/heads/master: a445f784ae5558a3da680aa6b39ed53c95a551c1
diff --git a/trunk/fs/jffs2/super.c b/trunk/fs/jffs2/super.c
index 61ea41389f90..1224d6b48e7e 100644
--- a/trunk/fs/jffs2/super.c
+++ b/trunk/fs/jffs2/super.c
@@ -100,6 +100,10 @@ static int jffs2_sync_fs(struct super_block *sb, int wait)
 {
 	struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
 
+#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+	cancel_delayed_work_sync(&c->wbuf_dwork);
+#endif
+
 	mutex_lock(&c->alloc_sem);
 	jffs2_flush_wbuf_pad(c);
 	mutex_unlock(&c->alloc_sem);