1 files changed, 20 insertions, 23 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index a199dbcee7d8..541a508adea1 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -183,8 +183,7 @@ xlog_bread_noalign(
         xfsbdstrat(log->l_mp, bp);
         error = xfs_buf_iowait(bp);
         if (error)
-                xfs_ioerror_alert("xlog_bread", log->l_mp,
-                                  bp, XFS_BUF_ADDR(bp));
+                xfs_buf_ioerror_alert(bp, __func__);
         return error;
 }
 
@@ -268,9 +267,10 @@ xlog_bwrite(
         xfs_buf_lock(bp);
         XFS_BUF_SET_COUNT(bp, BBTOB(nbblks));
 
-        if ((error = xfs_bwrite(log->l_mp, bp)))
-                xfs_ioerror_alert("xlog_bwrite", log->l_mp,
-                                  bp, XFS_BUF_ADDR(bp));
+        error = xfs_bwrite(bp);
+        if (error)
+                xfs_buf_ioerror_alert(bp, __func__);
+        xfs_buf_relse(bp);
         return error;
 }
 
@@ -361,9 +361,7 @@ xlog_recover_iodone(
                  * We're not going to bother about retrying
                  * this during recovery. One strike!
                  */
-                xfs_ioerror_alert("xlog_recover_iodone",
-                                        bp->b_target->bt_mount, bp,
-                                        XFS_BUF_ADDR(bp));
+                xfs_buf_ioerror_alert(bp, __func__);
                 xfs_force_shutdown(bp->b_target->bt_mount,
                                         SHUTDOWN_META_IO_ERROR);
         }
@@ -2135,8 +2133,7 @@ xlog_recover_buffer_pass2(
                 return XFS_ERROR(ENOMEM);
         error = bp->b_error;
         if (error) {
-                xfs_ioerror_alert("xlog_recover_do..(read#1)", mp,
-                                  bp, buf_f->blf_blkno);
+                xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#1)");
                 xfs_buf_relse(bp);
                 return error;
         }
@@ -2171,15 +2168,16 @@ xlog_recover_buffer_pass2(
             be16_to_cpu(*((__be16 *)xfs_buf_offset(bp, 0))) &&
             (XFS_BUF_COUNT(bp) != MAX(log->l_mp->m_sb.sb_blocksize,
                         (__uint32_t)XFS_INODE_CLUSTER_SIZE(log->l_mp)))) {
-                XFS_BUF_STALE(bp);
-                error = xfs_bwrite(mp, bp);
+                xfs_buf_stale(bp);
+                error = xfs_bwrite(bp);
         } else {
                 ASSERT(bp->b_target->bt_mount == mp);
                 bp->b_iodone = xlog_recover_iodone;
-                xfs_bdwrite(mp, bp);
+                xfs_buf_delwri_queue(bp);
         }
 
-        return (error);
+        xfs_buf_relse(bp);
+        return error;
 }
 
 STATIC int
@@ -2230,8 +2228,7 @@ xlog_recover_inode_pass2(
         }
         error = bp->b_error;
         if (error) {
-                xfs_ioerror_alert("xlog_recover_do..(read#2)", mp,
-                                  bp, in_f->ilf_blkno);
+                xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#2)");
                 xfs_buf_relse(bp);
                 goto error;
         }
@@ -2439,7 +2436,8 @@ xlog_recover_inode_pass2(
 write_inode_buffer:
         ASSERT(bp->b_target->bt_mount == mp);
         bp->b_iodone = xlog_recover_iodone;
-        xfs_bdwrite(mp, bp);
+        xfs_buf_delwri_queue(bp);
+        xfs_buf_relse(bp);
 error:
         if (need_free)
                 kmem_free(in_f);
@@ -2537,8 +2535,7 @@ xlog_recover_dquot_pass2(
                              XFS_FSB_TO_BB(mp, dq_f->qlf_len),
                              0, &bp);
         if (error) {
-                xfs_ioerror_alert("xlog_recover_do..(read#3)", mp,
-                                  bp, dq_f->qlf_blkno);
+                xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#3)");
                 return error;
         }
         ASSERT(bp);
@@ -2561,7 +2558,8 @@ xlog_recover_dquot_pass2(
         ASSERT(dq_f->qlf_size == 2);
         ASSERT(bp->b_target->bt_mount == mp);
         bp->b_iodone = xlog_recover_iodone;
-        xfs_bdwrite(mp, bp);
+        xfs_buf_delwri_queue(bp);
+        xfs_buf_relse(bp);
 
         return (0);
 }
@@ -3656,7 +3654,7 @@ xlog_do_recover(
                 return error;
         }
 
-        XFS_bflush(log->l_mp->m_ddev_targp);
+        xfs_flush_buftarg(log->l_mp->m_ddev_targp, 1);
 
         /*
          * If IO errors happened during recovery, bail out.
@@ -3689,8 +3687,7 @@ xlog_do_recover(
         xfsbdstrat(log->l_mp, bp);
         error = xfs_buf_iowait(bp);
         if (error) {
-                xfs_ioerror_alert("xlog_do_recover",
-                                  log->l_mp, bp, XFS_BUF_ADDR(bp));
+                xfs_buf_ioerror_alert(bp, __func__);
                 ASSERT(0);
                 xfs_buf_relse(bp);
                 return error;