diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2020-01-23 17:01:20 -0800 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2020-01-26 14:32:27 -0800 |
| commit | cdbcf82b86ea24aa942991b4233cd8ddf13f590c (patch) | |
| tree | 101e95548628abab5baa580c977476680949cc4a /fs/xfs/xfs_buf.c | |
| parent | 706b8c5bc70391be510a5454f307db90b622b279 (diff) | |
xfs: fix xfs_buf_ioerror_alert location reportingxfs-5.6-merge-8xfs-5.6-merge-7
Instead of passing __func__ to the error reporting function, let's use
the return address builtins so that the messages actually tell you which
higher level function called the buffer functions. This was previously
true for the xfs_buf_read callers, but not for the xfs_trans_read_buf
callers.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index b420e865b32e..217e4f82a44a 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -803,7 +803,8 @@ xfs_buf_read_map( int nmaps, xfs_buf_flags_t flags, struct xfs_buf **bpp, - const struct xfs_buf_ops *ops) + const struct xfs_buf_ops *ops, + xfs_failaddr_t fa) { struct xfs_buf *bp; int error; @@ -852,7 +853,7 @@ xfs_buf_read_map( */ if (error) { if (!XFS_FORCED_SHUTDOWN(target->bt_mount)) - xfs_buf_ioerror_alert(bp, __func__); + xfs_buf_ioerror_alert(bp, fa); bp->b_flags &= ~XBF_DONE; xfs_buf_stale(bp); @@ -885,7 +886,8 @@ xfs_buf_readahead_map( return; xfs_buf_read_map(target, map, nmaps, - XBF_TRYLOCK | XBF_ASYNC | XBF_READ_AHEAD, &bp, ops); + XBF_TRYLOCK | XBF_ASYNC | XBF_READ_AHEAD, &bp, ops, + __this_address); } /* @@ -1234,10 +1236,10 @@ __xfs_buf_ioerror( void xfs_buf_ioerror_alert( struct xfs_buf *bp, - const char *func) + xfs_failaddr_t func) { xfs_alert(bp->b_mount, -"metadata I/O error in \"%s\" at daddr 0x%llx len %d error %d", +"metadata I/O error in \"%pS\" at daddr 0x%llx len %d error %d", func, (uint64_t)XFS_BUF_ADDR(bp), bp->b_length, -bp->b_error); } |