xfs: xfs_sync_fsdata is redundant

Why do we need to write the superblock to disk once we've written
all the data?  We don't actually - the reasons for doing this are
lost in the mists of time, and go back to the way Irix used to drive
VFS flushing.

On linux, this code is only called from two contexts: remount and
.sync_fs. In the remount case, the call is followed by a metadata
sync, which unpins and writes the superblock.  In the sync_fs case,
we only need to force the log to disk to ensure that the superblock
is correctly on disk, so we don't actually need to write it. Hence
the functionality is either redundant or superfluous and thus can be
removed.

Seeing as xfs_quiesce_data is essentially now just a log force,
remove it as well and fold the code back into the two callers.
Neither of them need the log covering check, either, as that is
redundant for the remount case, and unnecessary for the .sync_fs
case.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 6 insertions, 13 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 27d5a92e1210..b5e445a13f7b 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1057,7 +1057,6 @@ xfs_fs_sync_fs(
         int                     wait)
 {
         struct xfs_mount        *mp = XFS_M(sb);
-        int                     error;
 
         /*
          * Doing anything during the async pass would be counterproductive.
@@ -1065,10 +1064,7 @@ xfs_fs_sync_fs(
         if (!wait)
                 return 0;
 
-        error = xfs_quiesce_data(mp);
-        if (error)
-                return -error;
-
+        xfs_log_force(mp, XFS_LOG_SYNC);
         if (laptop_mode) {
                 /*
                  * The disk must be active because we're syncing.
@@ -1238,15 +1234,12 @@ xfs_fs_remount(
         /* rw -> ro */
         if (!(mp->m_flags & XFS_MOUNT_RDONLY) && (*flags & MS_RDONLY)) {
                 /*
-                 * After we have synced the data but before we sync the
-                 * metadata, we need to free up the reserve block pool so that
-                 * the used block count in the superblock on disk is correct at
-                 * the end of the remount. Stash the current reserve pool size
-                 * so that if we get remounted rw, we can return it to the same
-                 * size.
+                 * Before we sync the metadata, we need to free up the reserve
+                 * block pool so that the used block count in the superblock on
+                 * disk is correct at the end of the remount. Stash the current
+                 * reserve pool size so that if we get remounted rw, we can
+                 * return it to the same size.
                  */
-
-                xfs_quiesce_data(mp);
                 xfs_save_resvblks(mp);
                 xfs_quiesce_attr(mp);
                 mp->m_flags |= XFS_MOUNT_RDONLY;