diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-08-23 10:10:07 +0300 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-09-29 14:58:42 +0100 |
| commit | a445f784ae5558a3da680aa6b39ed53c95a551c1 (patch) | |
| tree | acb2d42923d439793c4e37b42aaee217bc866893 /fs/jffs2 | |
| parent | b05a1187bbf35035300313987cbd22e362d71dc6 (diff) | |
| download | lwn-a445f784ae5558a3da680aa6b39ed53c95a551c1.tar.gz lwn-a445f784ae5558a3da680aa6b39ed53c95a551c1.zip | |
JFFS2: fix unmount regression
This patch fixes regression introduced by
"8bdc81c jffs2: get rid of jffs2_sync_super". We submit a delayed work in order
to make sure the write-buffer is synchronized at some point. But we do not
flush it when we unmount, which causes an oops when we unmount the file-system
and then the delayed work is executed.
This patch fixes the issue by adding a "cancel_delayed_work_sync()" infocation
in the '->sync_fs()' handler. This will make sure the delayed work is canceled
on sync, unmount and re-mount. And because VFS always callse 'sync_fs()' before
unmounting or remounting, this fixes the issue.
Reported-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: stable@vger.kernel.org [3.5+]
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/super.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 61ea41389f90..1224d6b48e7e 100644 --- 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); |