1 files changed, 4 insertions, 9 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 5cf06b85fd9d..3eca58f51ae9 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -796,8 +796,6 @@ xfs_fs_destroy_inode(
         if (is_bad_inode(inode))
                 goto out_reclaim;
 
-        xfs_ioend_wait(ip);
-
         ASSERT(XFS_FORCED_SHUTDOWN(ip->i_mount) || ip->i_delayed_blks == 0);
 
         /*
@@ -837,7 +835,6 @@ xfs_fs_inode_init_once(
         inode_init_once(VFS_I(ip));
 
         /* xfs inode */
-        atomic_set(&ip->i_iocount, 0);
         atomic_set(&ip->i_pincount, 0);
         spin_lock_init(&ip->i_flags_lock);
         init_waitqueue_head(&ip->i_ipin_wait);
@@ -887,7 +884,7 @@ xfs_log_inode(
         }
 
         xfs_ilock(ip, XFS_ILOCK_EXCL);
-        xfs_trans_ijoin_ref(tp, ip, XFS_ILOCK_EXCL);
+        xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
         xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
         return xfs_trans_commit(tp, 0);
 }
@@ -914,9 +911,8 @@ xfs_fs_write_inode(
                  * of forcing it all the way to stable storage using a
                  * synchronous transaction we let the log force inside the
                  * ->sync_fs call do that for thus, which reduces the number
-                 * of synchronous log foces dramatically.
+                 * of synchronous log forces dramatically.
                  */
-                xfs_ioend_wait(ip);
                 error = xfs_log_inode(ip);
                 if (error)
                         goto out;
@@ -1019,7 +1015,7 @@ xfs_fs_put_super(
          */
         xfs_filestream_unmount(mp);
 
-        XFS_bflush(mp->m_ddev_targp);
+        xfs_flush_buftarg(mp->m_ddev_targp, 1);
 
         xfs_unmountfs(mp);
         xfs_freesb(mp);
@@ -1443,7 +1439,7 @@ xfs_fs_fill_super(
          */
         xfs_filestream_unmount(mp);
 
-        XFS_bflush(mp->m_ddev_targp);
+        xfs_flush_buftarg(mp->m_ddev_targp, 1);
 
         xfs_unmountfs(mp);
         goto out_free_sb;
@@ -1670,7 +1666,6 @@ init_xfs_fs(void)
         printk(KERN_INFO XFS_VERSION_STRING " with "
                          XFS_BUILD_OPTIONS " enabled\n");
 
-        xfs_ioend_init();
         xfs_dir_startup();
 
         error = xfs_init_zones();