Commit 5679897e authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

vfs: make sync_filesystem return errors from ->sync_fs 



Strangely, sync_filesystem ignores the return code from the ->sync_fs
call, which means that syscalls like syncfs(2) never see the error.
This doesn't seem right, so fix that.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
parent 2719c716

fs/sync.c

+12 −6
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 */

int sync_filesystem(struct super_block *sb)

{

	int ret;

	int ret = 0;



	/*

	 * We need to be protected against the filesystem going from
@@ -52,15 +52,21 @@ int sync_filesystem(struct super_block *sb) 
	 * at a time.

	 */

	writeback_inodes_sb(sb, WB_REASON_SYNC);

	if (sb->s_op->sync_fs)

		sb->s_op->sync_fs(sb, 0);

	if (sb->s_op->sync_fs) {

		ret = sb->s_op->sync_fs(sb, 0);

		if (ret)

			return ret;

	}

	ret = sync_blockdev_nowait(sb->s_bdev);

	if (ret < 0)

	if (ret)

		return ret;



	sync_inodes_sb(sb);

	if (sb->s_op->sync_fs)

		sb->s_op->sync_fs(sb, 1);

	if (sb->s_op->sync_fs) {

		ret = sb->s_op->sync_fs(sb, 1);

		if (ret)

			return ret;

	}

	return sync_blockdev(sb->s_bdev);

}

EXPORT_SYMBOL(sync_filesystem);