Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / xfs / xfs_rw.c

diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c
index c96a8a0..597d044 100644 (file)
--- a/fs/xfs/xfs_rw.c
+++ b/fs/xfs/xfs_rw.c
@@ -91,24 +91,6 @@ xfs_do_force_shutdown(
        }
 }
 
-/*
- * Prints out an ALERT message about I/O error.
- */
-void
-xfs_ioerror_alert(
-       char                    *func,
-       struct xfs_mount        *mp,
-       xfs_buf_t               *bp,
-       xfs_daddr_t             blkno)
-{
-       xfs_alert(mp,
-                "I/O error occurred: meta-data dev %s block 0x%llx"
-                "       (\"%s\") error %d buf count %zd",
-               xfs_buf_target_name(bp->b_target),
-               (__uint64_t)blkno, func,
-               bp->b_error, XFS_BUF_COUNT(bp));
-}
-
 /*
  * This isn't an absolute requirement, but it is
  * just a good idea to call xfs_read_buf instead of
@@ -143,14 +125,13 @@ xfs_read_buf(
        } else {
                *bpp = NULL;
                if (error) {
-                       xfs_ioerror_alert("xfs_read_buf", mp, bp, XFS_BUF_ADDR(bp));
+                       xfs_buf_ioerror_alert(bp, __func__);
                } else {
                        error = XFS_ERROR(EIO);
                }
                if (bp) {
                        XFS_BUF_UNDONE(bp);
-                       XFS_BUF_UNDELAYWRITE(bp);
-                       XFS_BUF_STALE(bp);
+                       xfs_buf_stale(bp);
                        /*
                         * brelse clears B_ERROR and b_error
                         */