projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
fs
/
jffs2
/
super.c
diff --git
a/fs/jffs2/super.c
b/fs/jffs2/super.c
index ff487954cd96f1447b254b28a41fcdbd82b61b55..d3d8799e2187233e23e1614990443203d4fff1ad 100644
(file)
--- a/
fs/jffs2/super.c
+++ b/
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);