aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/xfs/xfs_buf.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 6f615c259411..cf0ac056815f 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1623,13 +1623,6 @@ xfs_buf_delwri_promote(
1623 spin_unlock(&btp->bt_delwri_lock); 1623 spin_unlock(&btp->bt_delwri_lock);
1624} 1624}
1625 1625
1626STATIC void
1627xfs_buf_runall_queues(
1628 struct workqueue_struct *queue)
1629{
1630 flush_workqueue(queue);
1631}
1632
1633/* 1626/*
1634 * Move as many buffers as specified to the supplied list 1627 * Move as many buffers as specified to the supplied list
1635 * idicating if we skipped any buffers to prevent deadlocks. 1628 * idicating if we skipped any buffers to prevent deadlocks.
@@ -1752,9 +1745,7 @@ xfs_flush_buftarg(
1752 LIST_HEAD(wait_list); 1745 LIST_HEAD(wait_list);
1753 struct blk_plug plug; 1746 struct blk_plug plug;
1754 1747
1755 xfs_buf_runall_queues(xfsconvertd_workqueue); 1748 flush_workqueue(xfslogd_workqueue);
1756 xfs_buf_runall_queues(xfsdatad_workqueue);
1757 xfs_buf_runall_queues(xfslogd_workqueue);
1758 1749
1759 set_bit(XBT_FORCE_FLUSH, &target->bt_flags); 1750 set_bit(XBT_FORCE_FLUSH, &target->bt_flags);
1760 pincount = xfs_buf_delwri_split(target, &tmp_list, 0); 1751 pincount = xfs_buf_delwri_split(target, &tmp_list, 0);