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

Commit 887ee171 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: remove unneeded call from ubifs_sync_fs 



Nowadays VFS always synchronizes all dirty inodes and pages before
calling '->sync_fs()', so remove unneeded 'generic_sync_sb_inodes()'
from 'ubifs_sync_fs()'. It used to be needed, but not any longer.

Pointed-out-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent e9d6bbc4

fs/ubifs/super.c

+7 −17
Original line number Original line Diff line number Diff line
@@ -437,12 +437,6 @@ static int ubifs_sync_fs(struct super_block *sb, int wait) 
{

{

	int i, err;

	int i, err;

	struct ubifs_info *c = sb->s_fs_info;

	struct ubifs_info *c = sb->s_fs_info;

	struct writeback_control wbc = {

		.sync_mode   = WB_SYNC_ALL,

		.range_start = 0,

		.range_end   = LLONG_MAX,

		.nr_to_write = LONG_MAX,

	};





	/*

	/*

	 * Zero @wait is just an advisory thing to help the file system shove

	 * Zero @wait is just an advisory thing to help the file system shove
@@ -452,17 +446,6 @@ static int ubifs_sync_fs(struct super_block *sb, int wait) 
	if (!wait)

	if (!wait)

		return 0;

		return 0;





	/*

	 * VFS calls '->sync_fs()' before synchronizing all dirty inodes and

	 * pages, so synchronize them first, then commit the journal. Strictly

	 * speaking, it is not necessary to commit the journal here,

	 * synchronizing write-buffers would be enough. But committing makes

	 * UBIFS free space predictions much more accurate, so we want to let

	 * the user be able to get more accurate results of 'statfs()' after

	 * they synchronize the file system.

	 */

	generic_sync_sb_inodes(sb, &wbc);



	/*

	/*

	 * Synchronize write buffers, because 'ubifs_run_commit()' does not

	 * Synchronize write buffers, because 'ubifs_run_commit()' does not

	 * do this if it waits for an already running commit.

	 * do this if it waits for an already running commit.
@@ -473,6 +456,13 @@ static int ubifs_sync_fs(struct super_block *sb, int wait) 
			return err;

			return err;

	}

	}





	/*

	 * Strictly speaking, it is not necessary to commit the journal here,

	 * synchronizing write-buffers would be enough. But committing makes

	 * UBIFS free space predictions much more accurate, so we want to let

	 * the user be able to get more accurate results of 'statfs()' after

	 * they synchronize the file system.

	 */

	err = ubifs_run_commit(c);

	err = ubifs_run_commit(c);

	if (err)

	if (err)

		return err;

		return err;