Skip to content

Commit

Permalink
Merge tag 'xfs-5.17-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/x…
Browse files Browse the repository at this point in the history
…fs-linux

Pull xfs fixes from Darrick Wong:
 "Nothing exciting, just more fixes for not returning sync_filesystem
  error values (and eliding it when it's not necessary).

  Summary:

   - Only call sync_filesystem when we're remounting the filesystem
     readonly readonly, and actually check its return value"

* tag 'xfs-5.17-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: only bother with sync_filesystem during readonly remount
  • Loading branch information
Linus Torvalds committed Feb 26, 2022
2 parents 9137eda + b97cca3 commit 3bd9dd8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions fs/xfs/xfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1753,6 +1753,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.
Expand Down Expand Up @@ -1831,8 +1836,6 @@ xfs_fs_reconfigure(
if (error)
return error;

sync_filesystem(mp->m_super);

/* inode32 -> inode64 */
if (xfs_has_small_inums(mp) && !xfs_has_small_inums(new_mp)) {
mp->m_features &= ~XFS_FEAT_SMALL_INUMS;
Expand Down

0 comments on commit 3bd9dd8

Please sign in to comment.