xfs: dump the first 128 bytes of any corrupt buffer

Increase the corrupt buffer dump to the first 128 bytes since v5
filesystems have larger block headers than before.

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 45987a2789304de7a239f43be196404490b1ccac..1981ef77040dabace28a4135abd1f2ebf1613a41 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1381,7 +1381,8 @@ _xfs_buf_ioapply(
                                xfs_warn(mp,
                                        "%s: no ops on block 0x%llx/0x%x",
                                        __func__, bp->b_bn, bp->b_length);
-                               xfs_hex_dump(bp->b_addr, 64);
+                               xfs_hex_dump(bp->b_addr,
+                                               XFS_CORRUPTION_DUMP_LEN);
                                dump_stack();
                        }
                }

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index be1211a851dce82e83b05e369e5b4f6bf28419d1..980d5f0660b58f8a95585aa9047928397da5cb81 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -336,7 +336,7 @@ xfs_corruption_error(
        xfs_failaddr_t          failaddr)
 {
        if (level <= xfs_error_level)
-               xfs_hex_dump(p, 64);
+               xfs_hex_dump(p, XFS_CORRUPTION_DUMP_LEN);
        xfs_error_report(tag, level, mp, filename, linenum, failaddr);
        xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair");
 }
@@ -364,8 +364,9 @@ xfs_verifier_error(
        xfs_alert(mp, "Unmount and run xfs_repair");
 
        if (xfs_error_level >= XFS_ERRLEVEL_LOW) {
-               xfs_alert(mp, "First 64 bytes of corrupted metadata buffer:");
-               xfs_hex_dump(xfs_buf_offset(bp, 0), 64);
+               xfs_alert(mp, "First %d bytes of corrupted metadata buffer:",
+                               XFS_CORRUPTION_DUMP_LEN);
+               xfs_hex_dump(xfs_buf_offset(bp, 0), XFS_CORRUPTION_DUMP_LEN);
        }
 
        if (xfs_error_level >= XFS_ERRLEVEL_HIGH)

diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index f086040266ac49174e659ba9b6672a116b6b65db..a3ba05bd983db5fbbc54dd5935a564cef3a92956 100644 (file)
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -39,6 +39,9 @@ extern void xfs_verifier_error(struct xfs_buf *bp, int error,
 #define XFS_ERRLEVEL_LOW       1
 #define XFS_ERRLEVEL_HIGH      5
 
+/* Dump 128 bytes of any corrupt buffer */
+#define XFS_CORRUPTION_DUMP_LEN                (128)
+
 /*
  * Macros to set EFSCORRUPTED & return/branch.
  */