xfs: kill xfs_read_buf()

xfs_read_buf() is effectively the same as xfs_trans_read_buf() when called
outside a transaction context. The error handling is slightly different in that
xfs_read_buf stales the errored buffer it gets back, but there is probably good
reason for xfs_trans_read_buf() for doing this.

Hence update xfs_trans_read_buf() to the same error handling as xfs_read_buf(),
and convert all the callers of xfs_read_buf() to use the former function. We can
then remove xfs_read_buf().

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 0d9bdb6bace4..c8ee0fc49042 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2539,14 +2539,11 @@ xlog_recover_dquot_pass2(
                 return XFS_ERROR(EIO);
         ASSERT(dq_f->qlf_len == 1);
 
-        error = xfs_read_buf(mp, mp->m_ddev_targp,
-                             dq_f->qlf_blkno,
-                             XFS_FSB_TO_BB(mp, dq_f->qlf_len),
-                             0, &bp);
-        if (error) {
-                xfs_buf_ioerror_alert(bp, "xlog_recover_do..(read#3)");
+        error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, dq_f->qlf_blkno,
+                                   XFS_FSB_TO_BB(mp, dq_f->qlf_len), 0, &bp);
+        if (error)
                 return error;
-        }
+
         ASSERT(bp);
         ddq = (xfs_disk_dquot_t *)xfs_buf_offset(bp, dq_f->qlf_boffset);