1 files changed, 5 insertions, 17 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 3494eff8e4eb..8f0333b3f7a0 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -765,20 +765,18 @@ xfs_open_devices(
          * Setup xfs_mount buffer target pointers
          */
         error = ENOMEM;
-        mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev, 0, mp->m_fsname);
+        mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev);
         if (!mp->m_ddev_targp)
                 goto out_close_rtdev;
 
         if (rtdev) {
-                mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev, 1,
-                                                        mp->m_fsname);
+                mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev);
                 if (!mp->m_rtdev_targp)
                         goto out_free_ddev_targ;
         }
 
         if (logdev && logdev != ddev) {
-                mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev, 1,
-                                                        mp->m_fsname);
+                mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev);
                 if (!mp->m_logdev_targp)
                         goto out_free_rtdev_targ;
         } else {
@@ -811,8 +809,7 @@ xfs_setup_devices(
 {
         int                     error;
 
-        error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,
-                                    mp->m_sb.sb_sectsize);
+        error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_sectsize);
         if (error)
                 return error;
 
@@ -822,14 +819,12 @@ xfs_setup_devices(
                 if (xfs_sb_version_hassector(&mp->m_sb))
                         log_sector_size = mp->m_sb.sb_logsectsize;
                 error = xfs_setsize_buftarg(mp->m_logdev_targp,
-                                            mp->m_sb.sb_blocksize,
                                             log_sector_size);
                 if (error)
                         return error;
         }
         if (mp->m_rtdev_targp) {
                 error = xfs_setsize_buftarg(mp->m_rtdev_targp,
-                                            mp->m_sb.sb_blocksize,
                                             mp->m_sb.sb_sectsize);
                 if (error)
                         return error;
@@ -1754,13 +1749,9 @@ init_xfs_fs(void)
         if (error)
                 goto out_destroy_wq;
 
-        error = xfs_filestream_init();
-        if (error)
-                goto out_mru_cache_uninit;
-
         error = xfs_buf_init();
         if (error)
-                goto out_filestream_uninit;
+                goto out_mru_cache_uninit;
 
         error = xfs_init_procfs();
         if (error)
@@ -1787,8 +1778,6 @@ init_xfs_fs(void)
         xfs_cleanup_procfs();
  out_buf_terminate:
         xfs_buf_terminate();
- out_filestream_uninit:
-        xfs_filestream_uninit();
  out_mru_cache_uninit:
         xfs_mru_cache_uninit();
  out_destroy_wq:
@@ -1807,7 +1796,6 @@ exit_xfs_fs(void)
         xfs_sysctl_unregister();
         xfs_cleanup_procfs();
         xfs_buf_terminate();
-        xfs_filestream_uninit();
         xfs_mru_cache_uninit();
         xfs_destroy_workqueues();
         xfs_destroy_zones();