Commit 7ba028af authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Zheng Zengkai
Browse files

xfs: only bother with sync_filesystem during readonly remount 

mainline inclusion
from mainline-v5.16-rc3
commit b97cca3b
category: bugfix
bugzilla: 187526,https://gitee.com/openeuler/kernel/issues/I4KIAO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b97cca3ba9098522e5a1c3388764ead42640c1a5



--------------------------------

In commit 02b9984d, we pushed a sync_filesystem() call from the VFS
into xfs_fs_remount.  The only time that we ever need to push dirty file
data or metadata to disk for a remount is if we're remounting the
filesystem read only, so this really could be moved to xfs_remount_ro.

Once we've moved the call site, actually check the return value from
sync_filesystem.

Fixes: 02b9984d ("fs: push sync_filesystem() down to the file system's remount_fs()")
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarGuo Xuenan <guoxuenan@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 5b35283a

fs/xfs/xfs_super.c

+5 −2
Original line number Diff line number Diff line
@@ -1774,6 +1774,11 @@ xfs_remount_ro( 
	};

	int			error;



	/* Flush all the dirty data to disk. */

	error = sync_filesystem(mp->m_super);

	if (error)

		return error;



	/*

	 * Cancel background eofb scanning so it cannot race with the final

	 * log force+buftarg wait and deadlock the remount.
@@ -1853,8 +1858,6 @@ xfs_fc_reconfigure( 
	if (error)

		return error;



	sync_filesystem(mp->m_super);



	/* inode32 -> inode64 */

	if ((mp->m_flags & XFS_MOUNT_SMALL_INUMS) &&

	    !(new_mp->m_flags & XFS_MOUNT_SMALL_INUMS)) {