ext3: fix synchronization of quota files in journal=data mode
In journal=data mode, it is not enough to do write_inode_now as done in vfs_quota_on() to write all data to their final location (which is needed for quota_read to work correctly). Calling journal_flush() does its job. Reported-by: Nick <gentuu@gmail.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
50c33a84db
commit
9cfe7b9010
|
@ -2759,23 +2759,42 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id,
|
||||||
|
|
||||||
if (!test_opt(sb, QUOTA))
|
if (!test_opt(sb, QUOTA))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
/* Not journalling quota or remount? */
|
/* When remounting, no checks are needed and in fact, path is NULL */
|
||||||
if ((!EXT3_SB(sb)->s_qf_names[USRQUOTA] &&
|
if (remount)
|
||||||
!EXT3_SB(sb)->s_qf_names[GRPQUOTA]) || remount)
|
|
||||||
return vfs_quota_on(sb, type, format_id, path, remount);
|
return vfs_quota_on(sb, type, format_id, path, remount);
|
||||||
|
|
||||||
err = path_lookup(path, LOOKUP_FOLLOW, &nd);
|
err = path_lookup(path, LOOKUP_FOLLOW, &nd);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
/* Quotafile not on the same filesystem? */
|
/* Quotafile not on the same filesystem? */
|
||||||
if (nd.path.mnt->mnt_sb != sb) {
|
if (nd.path.mnt->mnt_sb != sb) {
|
||||||
path_put(&nd.path);
|
path_put(&nd.path);
|
||||||
return -EXDEV;
|
return -EXDEV;
|
||||||
}
|
}
|
||||||
/* Quotafile not in fs root? */
|
/* Journaling quota? */
|
||||||
if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)
|
if (EXT3_SB(sb)->s_qf_names[type]) {
|
||||||
printk(KERN_WARNING
|
/* Quotafile not of fs root? */
|
||||||
"EXT3-fs: Quota file not on filesystem root. "
|
if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)
|
||||||
"Journalled quota will not work.\n");
|
printk(KERN_WARNING
|
||||||
|
"EXT3-fs: Quota file not on filesystem root. "
|
||||||
|
"Journaled quota will not work.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When we journal data on quota file, we have to flush journal to see
|
||||||
|
* all updates to the file when we bypass pagecache...
|
||||||
|
*/
|
||||||
|
if (ext3_should_journal_data(nd.path.dentry->d_inode)) {
|
||||||
|
/*
|
||||||
|
* We don't need to lock updates but journal_flush() could
|
||||||
|
* otherwise be livelocked...
|
||||||
|
*/
|
||||||
|
journal_lock_updates(EXT3_SB(sb)->s_journal);
|
||||||
|
journal_flush(EXT3_SB(sb)->s_journal);
|
||||||
|
journal_unlock_updates(EXT3_SB(sb)->s_journal);
|
||||||
|
}
|
||||||
|
|
||||||
path_put(&nd.path);
|
path_put(&nd.path);
|
||||||
return vfs_quota_on(sb, type, format_id, path, remount);
|
return vfs_quota_on(sb, type, format_id, path, remount);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue