1 files changed, 11 insertions, 8 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 206b97fd1d8a..19cbda196369 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -21,9 +21,7 @@
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
-#include "xfs_inum.h"
 #include "xfs_sb.h"
-#include "xfs_ag.h"
 #include "xfs_mount.h"
 #include "xfs_da_format.h"
 #include "xfs_inode.h"
@@ -44,7 +42,6 @@
 #include "xfs_icache.h"
 #include "xfs_trace.h"
 #include "xfs_icreate_item.h"
-#include "xfs_dinode.h"
 #include "xfs_filestream.h"
 #include "xfs_quota.h"
 #include "xfs_sysfs.h"
@@ -796,8 +793,7 @@ xfs_open_devices(
  out_free_ddev_targ:
         xfs_free_buftarg(mp, mp->m_ddev_targp);
  out_close_rtdev:
-        if (rtdev)
-                xfs_blkdev_put(rtdev);
+        xfs_blkdev_put(rtdev);
  out_close_logdev:
         if (logdev && logdev != ddev)
                 xfs_blkdev_put(logdev);
@@ -842,10 +838,15 @@ STATIC int
 xfs_init_mount_workqueues(
         struct xfs_mount        *mp)
 {
+        mp->m_buf_workqueue = alloc_workqueue("xfs-buf/%s",
+                        WQ_MEM_RECLAIM|WQ_FREEZABLE, 1, mp->m_fsname);
+        if (!mp->m_buf_workqueue)
+                goto out;
+
         mp->m_data_workqueue = alloc_workqueue("xfs-data/%s",
                         WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
         if (!mp->m_data_workqueue)
-                goto out;
+                goto out_destroy_buf;
 
         mp->m_unwritten_workqueue = alloc_workqueue("xfs-conv/%s",
                         WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
@@ -863,7 +864,7 @@ xfs_init_mount_workqueues(
                 goto out_destroy_cil;
 
         mp->m_log_workqueue = alloc_workqueue("xfs-log/%s",
-                        WQ_FREEZABLE, 0, mp->m_fsname);
+                        WQ_FREEZABLE|WQ_HIGHPRI, 0, mp->m_fsname);
         if (!mp->m_log_workqueue)
                 goto out_destroy_reclaim;
 
@@ -884,6 +885,8 @@ out_destroy_unwritten:
         destroy_workqueue(mp->m_unwritten_workqueue);
 out_destroy_data_iodone_queue:
         destroy_workqueue(mp->m_data_workqueue);
+out_destroy_buf:
+        destroy_workqueue(mp->m_buf_workqueue);
 out:
         return -ENOMEM;
 }
@@ -898,6 +901,7 @@ xfs_destroy_mount_workqueues(
         destroy_workqueue(mp->m_cil_workqueue);
         destroy_workqueue(mp->m_data_workqueue);
         destroy_workqueue(mp->m_unwritten_workqueue);
+        destroy_workqueue(mp->m_buf_workqueue);
 }
 
 /*
@@ -1000,7 +1004,6 @@ xfs_fs_evict_inode(
         clear_inode(inode);
         XFS_STATS_INC(vn_rele);
         XFS_STATS_INC(vn_remove);
-        XFS_STATS_DEC(vn_active);
 
         xfs_inactive(ip);
 }