xfs: xfs_buf_corruption_error should take __this_address

Add a xfs_failaddr_t parameter to this function so that callers can
potentially pass in (and therefore report) the exact point in the code
where we decided that a metadata buffer was corrupt.  This enables us to
wire it up to checking functions that have to run outside of verifiers.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 6552e5991f73d4904630f8623993d78287712417..f880141a226816e6b142a4904ffba906211848cc 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1591,7 +1591,7 @@ __xfs_buf_mark_corrupt(
 {
        ASSERT(bp->b_flags & XBF_DONE);
 
-       xfs_buf_corruption_error(bp);
+       xfs_buf_corruption_error(bp, fa);
        xfs_buf_stale(bp);
 }
 

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 57068d4ffba2f1524020572a9d3a2d0f090334f8..a21e9cc6516ada10b1ffd76010a8005a0b2c3659 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -350,13 +350,14 @@ xfs_corruption_error(
  */
 void
 xfs_buf_corruption_error(
-       struct xfs_buf          *bp)
+       struct xfs_buf          *bp,
+       xfs_failaddr_t          fa)
 {
        struct xfs_mount        *mp = bp->b_mount;
 
        xfs_alert_tag(mp, XFS_PTAG_VERIFIER_ERROR,
                  "Metadata corruption detected at %pS, %s block 0x%llx",
-                 __return_address, bp->b_ops->name, bp->b_bn);
+                 fa, bp->b_ops->name, bp->b_bn);
 
        xfs_alert(mp, "Unmount and run xfs_repair");
 

diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index 31a5d321ba9a1fa90bb5a4e4e5103663c6ef7771..1717b7508356443d62ed3f70e0a1116f6a1b28ef 100644 (file)
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -15,7 +15,7 @@ extern void xfs_corruption_error(const char *tag, int level,
                        struct xfs_mount *mp, const void *buf, size_t bufsize,
                        const char *filename, int linenum,
                        xfs_failaddr_t failaddr);
-void xfs_buf_corruption_error(struct xfs_buf *bp);
+void xfs_buf_corruption_error(struct xfs_buf *bp, xfs_failaddr_t fa);
 extern void xfs_buf_verifier_error(struct xfs_buf *bp, int error,
                        const char *name, const void *buf, size_t bufsz,
                        xfs_failaddr_t failaddr);