1 files changed, 11 insertions, 2 deletions

diff --git a/fs/xfs/xfs_sync.c b/fs/xfs/xfs_sync.c
index 1e9ee064dbb2..97304f10e78a 100644
--- a/fs/xfs/xfs_sync.c
+++ b/fs/xfs/xfs_sync.c
@@ -359,6 +359,15 @@ xfs_quiesce_attr(
          * added an item to the AIL, thus flush it again.
          */
         xfs_ail_push_all_sync(mp->m_ail);
+
+        /*
+         * 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);
 }
 
 static void
@@ -712,8 +721,8 @@ restart:
          * Note that xfs_iflush will never block on the inode buffer lock, as
          * xfs_ifree_cluster() can lock the inode buffer before it locks the
          * ip->i_lock, and we are doing the exact opposite here.  As a result,
-         * doing a blocking xfs_itobp() to get the cluster buffer would result
-         * in an ABBA deadlock with xfs_ifree_cluster().
+         * doing a blocking xfs_imap_to_bp() to get the cluster buffer would
+         * result in an ABBA deadlock with xfs_ifree_cluster().
          *
          * As xfs_ifree_cluser() must gather all inodes that are active in the
          * cache to mark them stale, if we hit this case we don't actually want