xfs: clean up xfs_ioerror_alert

Instead of passing the block number and mount structure explicitly
get them off the bp and fix make the argument order more natural.

Also move it to xfs_buf.c and stop printing the device name given
that we already get the fs name as part of xfs_alert, and we know
what device is operates on because of the caller that gets printed,
finally rename it to xfs_buf_ioerror_alert and pass __func__ as
argument where it makes sense.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index fc38f15808c..4ecf2a54906 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -87,8 +87,7 @@ xfs_readlink_bmap(
                         return XFS_ERROR(ENOMEM);
                 error = bp->b_error;
                 if (error) {
-                        xfs_ioerror_alert("xfs_readlink",
-                                  ip->i_mount, bp, XFS_BUF_ADDR(bp));
+                        xfs_buf_ioerror_alert(bp, __func__);
                         xfs_buf_relse(bp);
                         goto out;
                 }
@@ -1993,8 +1992,8 @@ xfs_zero_remaining_bytes(
                 xfsbdstrat(mp, bp);
                 error = xfs_buf_iowait(bp);
                 if (error) {
-                        xfs_ioerror_alert("xfs_zero_remaining_bytes(read)",
-                                          mp, bp, XFS_BUF_ADDR(bp));
+                        xfs_buf_ioerror_alert(bp,
+                                        "xfs_zero_remaining_bytes(read)");
                         break;
                 }
                 memset(bp->b_addr +
@@ -2006,8 +2005,8 @@ xfs_zero_remaining_bytes(
                 xfsbdstrat(mp, bp);
                 error = xfs_buf_iowait(bp);
                 if (error) {
-                        xfs_ioerror_alert("xfs_zero_remaining_bytes(write)",
-                                          mp, bp, XFS_BUF_ADDR(bp));
+                        xfs_buf_ioerror_alert(bp,
+                                        "xfs_zero_remaining_bytes(write)");
                         break;
                 }
         }