Commit a1177825 authored by Jan Kara's avatar Jan Kara Committed by Al Viro
Browse files

quota: Move quota syncing to ->sync_fs method 



Since the moment writes to quota files are using block device page cache and
space for quota structures is reserved at the moment they are first accessed we
have no reason to sync quota before inode writeback. In fact this order is now
only harmful since quota information can easily change during inode writeback
(either because conversion of delayed-allocated extents or simply because of
allocation of new blocks for simple filesystems not using page_mkwrite).

So move syncing of quota information after writeback of inodes into ->sync_fs
method. This way we do not have to use ->quota_sync callback which is primarily
intended for use by quotactl syscall anyway and we get rid of calling
->sync_fs() twice unnecessarily. We skip quota syncing for OCFS2 since it does
proper quota journalling in all cases (unlike ext3, ext4, and reiserfs which
also support legacy non-journalled quotas) and thus there are no dirty quota
structures.

CC: "Theodore Ts'o" <tytso@mit.edu>
CC: Joel Becker <jlbec@evilplan.org>
CC: reiserfs-devel@vger.kernel.org
Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Acked-by: default avatarDave Kleikamp <shaggy@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ceed1723

fs/ext2/super.c

+6 −0
Original line number Diff line number Diff line
@@ -1184,6 +1184,12 @@ static int ext2_sync_fs(struct super_block *sb, int wait) 
	struct ext2_sb_info *sbi = EXT2_SB(sb);

	struct ext2_super_block *es = EXT2_SB(sb)->s_es;



	/*

	 * Write quota structures to quota file, sync_blockdev() will write

	 * them to disk later

	 */

	dquot_writeback_dquots(sb, -1);



	spin_lock(&sbi->s_lock);

	if (es->s_state & cpu_to_le16(EXT2_VALID_FS)) {

		ext2_debug("setting valid to 0\n");

fs/ext3/super.c

+5 −0
Original line number Diff line number Diff line
@@ -2526,6 +2526,11 @@ static int ext3_sync_fs(struct super_block *sb, int wait) 
	tid_t target;



	trace_ext3_sync_fs(sb, wait);

	/*

	 * Writeback quota in non-journalled quota case - journalled quota has

	 * no dirty dquots

	 */

	dquot_writeback_dquots(sb, -1);

	if (journal_start_commit(EXT3_SB(sb)->s_journal, &target)) {

		if (wait)

			log_wait_commit(EXT3_SB(sb)->s_journal, target);

fs/ext4/super.c

+5 −0
Original line number Diff line number Diff line
@@ -4325,6 +4325,11 @@ static int ext4_sync_fs(struct super_block *sb, int wait) 


	trace_ext4_sync_fs(sb, wait);

	flush_workqueue(sbi->dio_unwritten_wq);

	/*

	 * Writeback quota in non-journalled quota case - journalled quota has

	 * no dirty dquots

	 */

	dquot_writeback_dquots(sb, -1);

	if (jbd2_journal_start_commit(sbi->s_journal, &target)) {

		if (wait)

			jbd2_log_wait_commit(sbi->s_journal, target);

fs/gfs2/super.c

+2 −0
Original line number Diff line number Diff line
@@ -952,6 +952,8 @@ restart: 
static int gfs2_sync_fs(struct super_block *sb, int wait)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;



	gfs2_quota_sync(sb, -1);

	if (wait && sdp)

		gfs2_log_flush(sdp, NULL);

	return 0;

fs/jfs/super.c

+5 −0
Original line number Diff line number Diff line
@@ -601,6 +601,11 @@ static int jfs_sync_fs(struct super_block *sb, int wait) 


	/* log == NULL indicates read-only mount */

	if (log) {

		/*

		 * Write quota structures to quota file, sync_blockdev() will

		 * write them to disk later

		 */

		dquot_writeback_dquots(sb, -1);

		jfs_flush_journal(log, wait);

		jfs_syncpt(log, 0);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE