aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/super.c
diff options
context:
space:
mode:
authorGravatar Jan Kara <jack@suse.cz> 2010-05-13 22:14:53 +0200
committerGravatar Jan Kara <jack@suse.cz> 2010-05-24 14:06:39 +0200
commiteea7feb072f5914ecafa95b3d83be0c229244d90 (patch)
treec9179933bd14f11f883448bd133876f907c3f50c /fs/ocfs2/super.c
parentfbmem: avoid printk format warning with 32-bit resources (diff)
downloadlinux-eea7feb072f5914ecafa95b3d83be0c229244d90.tar.gz
linux-eea7feb072f5914ecafa95b3d83be0c229244d90.tar.bz2
linux-eea7feb072f5914ecafa95b3d83be0c229244d90.zip
ocfs2: Fix use after free on remount read-only
We also have to cancel quota syncing thread on remount read only because at that moment quota is being turned off. Otherwise quota syncing thread will try to access already freed quota structures. Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r--fs/ocfs2/super.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 2c26ce251cb3..66f9984a983c 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -883,9 +883,15 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend)
sb_dqopt(sb)->files[type],
type, QFMT_OCFS2,
DQUOT_SUSPENDED);
- else
+ else {
+ struct ocfs2_mem_dqinfo *oinfo;
+
+ /* Cancel periodic syncing before suspending */
+ oinfo = sb_dqinfo(sb, type)->dqi_priv;
+ cancel_delayed_work_sync(&oinfo->dqi_sync_work);
status = vfs_quota_disable(sb, type,
DQUOT_SUSPENDED);
+ }
if (status < 0)
break;
}