From: Darrick J. Wong Date: Tue, 10 Jan 2017 02:16:33 +0000 (-0600) Subject: libxfs: refactor btree crc verifier X-Git-Tag: v4.10.0-rc1~92 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca4eb8965d6d4d5ad47866247527a816bb04dde;p=thirdparty%2Fxfsprogs-dev.git libxfs: refactor btree crc verifier In a65d8d293b ("libxfs: validate metadata LSNs against log on v5 superblocks") the hascrc check was modified to use the helper mp variable in the kernel. This was left out of the xfsprogs patch, so change it here too. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index 1d41265d8..3dea6bd31 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -244,7 +244,7 @@ xfs_btree_lblock_verify_crc( struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb)) { + if (xfs_sb_version_hascrc(&mp->m_sb)) { if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.l.bb_lsn))) return false; return xfs_buf_verify_cksum(bp, XFS_BTREE_LBLOCK_CRC_OFF); @@ -282,7 +282,7 @@ xfs_btree_sblock_verify_crc( struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb)) { + if (xfs_sb_version_hascrc(&mp->m_sb)) { if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.s.bb_lsn))) return false; return xfs_buf_verify_cksum(bp, XFS_BTREE_SBLOCK_CRC_OFF);