Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d4f7fdd authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

reiserfs: 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_end_sync() before calling
vfs_quota_on() does it's job because transactions are committed to the journal
and data marked as dirty in memory so write_inode_now() writes them to their
final locations.

Cc: <reiserfs-devel@vger.kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 895c23f8

fs/reiserfs/super.c

+21 −9
Original line number Diff line number Diff line
@@ -2026,6 +2026,7 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id, 
	int err;

	struct nameidata nd;

	struct inode *inode;

	struct reiserfs_transaction_handle th;



	if (!(REISERFS_SB(sb)->s_mount_opt & (1 << REISERFS_QUOTA)))

		return -EINVAL;
@@ -2053,17 +2054,28 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id, 
		}

		mark_inode_dirty(inode);

	}

	/* Not journalling quota? No more tests needed... */

	if (!REISERFS_SB(sb)->s_qf_names[USRQUOTA] &&

	    !REISERFS_SB(sb)->s_qf_names[GRPQUOTA]) {

		path_put(&nd.path);

		return vfs_quota_on(sb, type, format_id, path, 0);

	}

	/* Journaling quota? */

	if (REISERFS_SB(sb)->s_qf_names[type]) {

		/* Quotafile not of fs root? */

		if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)

			reiserfs_warning(sb,

				 "reiserfs: Quota file not on filesystem root. "

				 "Journalled quota will not work.");

	}



	/*

	 * When we journal data on quota file, we have to flush journal to see

	 * all updates to the file when we bypass pagecache...

	 */

	if (reiserfs_file_data_log(inode)) {

		/* Just start temporary transaction and finish it */

		err = journal_begin(&th, sb, 1);

		if (err)

			return err;

		err = journal_end_sync(&th, sb, 1);

		if (err)

			return err;

	}

	path_put(&nd.path);

	return vfs_quota_on(sb, type, format_id, path, 0);

}