Commit b97cca3b authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: only bother with sync_filesystem during readonly remount

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>
parent cea267c2
...@@ -1749,6 +1749,11 @@ xfs_remount_ro( ...@@ -1749,6 +1749,11 @@ xfs_remount_ro(
}; };
int error; 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 * Cancel background eofb scanning so it cannot race with the final
* log force+buftarg wait and deadlock the remount. * log force+buftarg wait and deadlock the remount.
...@@ -1827,8 +1832,6 @@ xfs_fs_reconfigure( ...@@ -1827,8 +1832,6 @@ xfs_fs_reconfigure(
if (error) if (error)
return error; return error;
sync_filesystem(mp->m_super);
/* inode32 -> inode64 */ /* inode32 -> inode64 */
if (xfs_has_small_inums(mp) && !xfs_has_small_inums(new_mp)) { if (xfs_has_small_inums(mp) && !xfs_has_small_inums(new_mp)) {
mp->m_features &= ~XFS_FEAT_SMALL_INUMS; mp->m_features &= ~XFS_FEAT_SMALL_INUMS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment