1 files changed, 2 insertions, 23 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 0fa987dea242..acd846d808b2 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2347,11 +2347,11 @@ cluster_corrupt_out:
          */
         rcu_read_unlock();
         /*
-         * Clean up the buffer.  If it was B_DELWRI, just release it --
+         * Clean up the buffer.  If it was delwri, just release it --
          * brelse can handle it with no problems.  If not, shut down the
          * filesystem before releasing the buffer.
          */
-        bufwasdelwri = XFS_BUF_ISDELAYWRITE(bp);
+        bufwasdelwri = (bp->b_flags & _XBF_DELWRI_Q);
         if (bufwasdelwri)
                 xfs_buf_relse(bp);
 
@@ -2685,27 +2685,6 @@ corrupt_out:
         return XFS_ERROR(EFSCORRUPTED);
 }
 
-void
-xfs_promote_inode(
-        struct xfs_inode        *ip)
-{
-        struct xfs_buf          *bp;
-
-        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED));
-
-        bp = xfs_incore(ip->i_mount->m_ddev_targp, ip->i_imap.im_blkno,
-                        ip->i_imap.im_len, XBF_TRYLOCK);
-        if (!bp)
-                return;
-
-        if (XFS_BUF_ISDELAYWRITE(bp)) {
-                xfs_buf_delwri_promote(bp);
-                wake_up_process(ip->i_mount->m_ddev_targp->bt_task);
-        }
-
-        xfs_buf_relse(bp);
-}
-
 /*
  * Return a pointer to the extent record at file index idx.
  */