| Message ID | 147830451684.26713.17449721738475726138.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Nov 04, 2016 at 05:08:36PM -0700, Darrick J. Wong wrote: > 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 <darrick.wong@oracle.com> Looks fine, Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index 1d41265..3dea6bd 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);
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 <darrick.wong@oracle.com> --- libxfs/xfs_btree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html