lkml.org 
[lkml]   [2022]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 10/86] xfs: only bother with sync_filesystem during readonly remount
    Date
    From: "Darrick J. Wong" <djwong@kernel.org>

    commit b97cca3ba9098522e5a1c3388764ead42640c1a5 upstream.

    In commit 02b9984d6408, 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: 02b9984d6408 ("fs: push sync_filesystem() down to the file system's remount_fs()")
    Signed-off-by: Darrick J. Wong <djwong@kernel.org>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Signed-off-by: Amir Goldstein <amir73il@gmail.com>
    Acked-by: Darrick J. Wong <djwong@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/xfs/xfs_super.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/fs/xfs/xfs_super.c
    +++ b/fs/xfs/xfs_super.c
    @@ -1720,6 +1720,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.
    @@ -1790,8 +1795,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)) {

    \
     
     \ /
      Last update: 2022-08-29 13:09    [W:4.058 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site