1 files changed, 9 insertions, 2 deletions

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index b09a4a7eb640..29c2f83d4147 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1200,8 +1200,6 @@ xfs_mountfs(
 
         xfs_set_maxicount(mp);
 
-        mp->m_maxioffset = xfs_max_file_offset(sbp->sb_blocklog);
-
         error = xfs_uuid_mount(mp);
         if (error)
                 goto out;
@@ -1531,6 +1529,15 @@ xfs_unmountfs(
         xfs_ail_push_all_sync(mp->m_ail);
         xfs_wait_buftarg(mp->m_ddev_targp);
 
+        /*
+         * The superblock buffer is uncached and xfsaild_push() will lock and
+         * set the XBF_ASYNC flag on the buffer. We cannot do xfs_buf_iowait()
+         * here but a lock on the superblock buffer will block until iodone()
+         * has completed.
+         */
+        xfs_buf_lock(mp->m_sb_bp);
+        xfs_buf_unlock(mp->m_sb_bp);
+
         xfs_log_unmount_write(mp);
         xfs_log_unmount(mp);
         xfs_uuid_unmount(mp);