hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: print specific dqblk that failed verifiers 

Rather than printing the top of the buffer that held a corrupted dqblk,
restructure things to print out the specific one that failed by pushing
the calls to the verifier_error function down into the verifier which
iterates over the buffer and detects the error.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Eric Sandeen 2018-05-07 09:20:47 -07:00 committed by Darrick J. Wong
parent 7224fa482a
commit 72c5c5f6d0
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/xfs/libxfs/xfs_dquot_buf.c
View File

@ -152,7 +152,8 @@ xfs_dqblk_repair(
STATIC bool STATIC bool
xfs_dquot_buf_verify_crc( xfs_dquot_buf_verify_crc(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_buf *bp) struct xfs_buf *bp,
bool readahead)
{ {
struct xfs_dqblk *d = (struct xfs_dqblk *)bp->b_addr; struct xfs_dqblk *d = (struct xfs_dqblk *)bp->b_addr;
int ndquots; int ndquots;
@ -173,16 +174,21 @@ xfs_dquot_buf_verify_crc(
for (i = 0; i < ndquots; i++, d++) { for (i = 0; i < ndquots; i++, d++) {
if (!xfs_verify_cksum((char *)d, sizeof(struct xfs_dqblk), if (!xfs_verify_cksum((char *)d, sizeof(struct xfs_dqblk),
XFS_DQUOT_CRC_OFF)) XFS_DQUOT_CRC_OFF)) {
if (!readahead)
xfs_buf_verifier_error(bp, -EFSBADCRC, __func__,
d, sizeof(*d), __this_address);
return false; return false;
} }
}
return true; return true;
} }
STATIC xfs_failaddr_t STATIC xfs_failaddr_t
xfs_dquot_buf_verify( xfs_dquot_buf_verify(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_buf *bp) struct xfs_buf *bp,
bool readahead)
{ {
struct xfs_dqblk *dqb = bp->b_addr; struct xfs_dqblk *dqb = bp->b_addr;
xfs_failaddr_t fa; xfs_failaddr_t fa;
@ -216,9 +222,14 @@ xfs_dquot_buf_verify(
id = be32_to_cpu(ddq->d_id); id = be32_to_cpu(ddq->d_id);
fa = xfs_dqblk_verify(mp, &dqb[i], id + i, 0); fa = xfs_dqblk_verify(mp, &dqb[i], id + i, 0);
if (fa) if (fa) {
if (!readahead)
xfs_buf_verifier_error(bp, -EFSCORRUPTED,
__func__, &dqb[i],
sizeof(struct xfs_dqblk), fa);
return fa; return fa;
} }
}
return NULL; return NULL;
} }
@ -229,7 +240,7 @@ xfs_dquot_buf_verify_struct(
{ {
struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_mount *mp = bp->b_target->bt_mount;
return xfs_dquot_buf_verify(mp, bp); return xfs_dquot_buf_verify(mp, bp, false);
} }
static void static void
@ -237,15 +248,10 @@ xfs_dquot_buf_read_verify(
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_mount *mp = bp->b_target->bt_mount;
xfs_failaddr_t fa;
if (!xfs_dquot_buf_verify_crc(mp, bp)) if (!xfs_dquot_buf_verify_crc(mp, bp, false))
xfs_verifier_error(bp, -EFSBADCRC, __this_address); return;
else { xfs_dquot_buf_verify(mp, bp, false);
fa = xfs_dquot_buf_verify(mp, bp);
if (fa)
xfs_verifier_error(bp, -EFSCORRUPTED, __this_address);
}
} }
/* /*
@ -260,8 +266,8 @@ xfs_dquot_buf_readahead_verify(
{ {
struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_mount *mp = bp->b_target->bt_mount;
if (!xfs_dquot_buf_verify_crc(mp, bp) || if (!xfs_dquot_buf_verify_crc(mp, bp, true) ||
xfs_dquot_buf_verify(mp, bp) != NULL) { xfs_dquot_buf_verify(mp, bp, true) != NULL) {
xfs_buf_ioerror(bp, -EIO); xfs_buf_ioerror(bp, -EIO);
bp->b_flags &= ~XBF_DONE; bp->b_flags &= ~XBF_DONE;
} }
@ -277,11 +283,8 @@ xfs_dquot_buf_write_verify(
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_mount *mp = bp->b_target->bt_mount;
xfs_failaddr_t fa;
fa = xfs_dquot_buf_verify(mp, bp); xfs_dquot_buf_verify(mp, bp, false);
if (fa)
xfs_verifier_error(bp, -EFSCORRUPTED, __this_address);
} }
const struct xfs_buf_ops xfs_dquot_buf_ops = { const struct xfs_buf_ops xfs_dquot_buf_ops = {