[10/10] xfs: condense crc and verifier checks where possible

Message ID	5ef4acb1-ce08-2246-8ac2-54da58e6c1b3@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 10/10] xfs: condense crc and verifier checks where possible To: Eric Sandeen <sandeen@redhat.com>, linux-xfs <linux-xfs@vger.kernel.org> References: <542b81dc-b564-c5fa-86b4-b4dc8ac50b63@redhat.com> From: Eric Sandeen <sandeen@redhat.com> Message-ID: <5ef4acb1-ce08-2246-8ac2-54da58e6c1b3@redhat.com> Date: Wed, 5 Dec 2018 15:11:51 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <542b81dc-b564-c5fa-86b4-b4dc8ac50b63@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	xfs: add verifier context structure \| expand [RFC,0/10] xfs: add verifier context structure [01/10] xfs: change xfs_attr3_rmt_hdr_ok to return bool [02/10] xfs: make checksum verifiers consistently return bools [03/10] xfs: pass a verifier context down verifier callchains [04/10] xfs: pass a verifier context to crc validation functions [05/10] xfs: define new macros to set verifier context on return [06/10] xfs: teach xfs_btree_[sl]block_verify_crc to populate verifier context [07/10] xfs: change all verifiers to return booleans [08/10] xfs: set failaddr into vc for checksum failures [09/10] xfs: add errno to verifier context and populate it [10/10] xfs: condense crc and verifier checks where possible

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 213a3078113c..5499438e6ee1 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -609,12 +609,9 @@ xfs_agfl_read_verify( if (!xfs_sb_version_hascrc(&mp->m_sb)) return; - if (!xfs_buf_verify_cksum(vc, bp, XFS_AGFL_CRC_OFF)) + if (!xfs_buf_verify_cksum(vc, bp, XFS_AGFL_CRC_OFF) || + !xfs_agfl_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_agfl_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } } static void @@ -2635,14 +2632,11 @@ xfs_agf_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_AGF_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_AGF_CRC_OFF)) || + XFS_TEST_ERROR(!xfs_agf_verify(vc, bp), + mp, XFS_ERRTAG_ALLOC_READ_AGF)) xfs_verifier_error(bp, vc); - else { - if (XFS_TEST_ERROR(!xfs_agf_verify(vc, bp), - mp, XFS_ERRTAG_ALLOC_READ_AGF)) - xfs_verifier_error(bp, vc); - } } static void diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c index 9f56821b49af..84f3f9542279 100644 --- a/fs/xfs/libxfs/xfs_alloc_btree.c +++ b/fs/xfs/libxfs/xfs_alloc_btree.c @@ -346,12 +346,9 @@ xfs_allocbt_read_verify( struct xfs_vc *vc, struct xfs_buf *bp) { - if (!xfs_btree_sblock_verify_crc(vc, bp)) + if (!xfs_btree_sblock_verify_crc(vc, bp) || + !xfs_allocbt_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_allocbt_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } if (bp->b_error) trace_xfs_btree_corrupt(bp, _RET_IP_); diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 34958aa7fe5f..3f116f57c57d 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -357,13 +357,10 @@ xfs_attr3_leaf_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_ATTR3_LEAF_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_ATTR3_LEAF_CRC_OFF)) || + !xfs_attr3_leaf_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_attr3_leaf_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } } const struct xfs_buf_ops xfs_attr3_leaf_buf_ops = { diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index 46db4a7269d8..b59d2331ee24 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c @@ -77,13 +77,10 @@ xfs_dir3_block_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_DATA_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_DATA_CRC_OFF)) || + !xfs_dir3_block_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_dir3_block_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } } static void diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c index 9904571a76d0..554d2b0f06b4 100644 --- a/fs/xfs/libxfs/xfs_dir2_data.c +++ b/fs/xfs/libxfs/xfs_dir2_data.c @@ -304,13 +304,10 @@ xfs_dir3_data_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_DATA_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_DATA_CRC_OFF)) || + !xfs_dir3_data_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_dir3_data_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } } static void diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index aa423cd57bd7..b316f3d63e89 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -183,13 +183,10 @@ __read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_LEAF_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_LEAF_CRC_OFF)) || + !xfs_dir3_leaf_verify(vc, bp, magic)) xfs_verifier_error(bp, vc); - else { - if (!xfs_dir3_leaf_verify(vc, bp, magic)) - xfs_verifier_error(bp, vc); - } } static void diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 8a78233bff9d..b88452362247 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -116,13 +116,10 @@ xfs_dir3_free_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_FREE_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_DIR3_FREE_CRC_OFF)) || + !xfs_dir3_free_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_dir3_free_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } } static void diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 99df9cb8161e..ec6b32da1217 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -2555,14 +2555,11 @@ xfs_agi_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; - if (xfs_sb_version_hascrc(&mp->m_sb) && - !xfs_buf_verify_cksum(vc, bp, XFS_AGI_CRC_OFF)) + if ((xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_buf_verify_cksum(vc, bp, XFS_AGI_CRC_OFF)) || + XFS_TEST_ERROR(!xfs_agi_verify(vc, bp), + mp, XFS_ERRTAG_IALLOC_READ_AGI)) xfs_verifier_error(bp, vc); - else { - if (XFS_TEST_ERROR(!xfs_agi_verify(vc, bp), - mp, XFS_ERRTAG_IALLOC_READ_AGI)) - xfs_verifier_error(bp, vc); - } } static void diff --git a/fs/xfs/libxfs/xfs_symlink_remote.c b/fs/xfs/libxfs/xfs_symlink_remote.c index 0c708fb92e89..9f251b5205a9 100644 --- a/fs/xfs/libxfs/xfs_symlink_remote.c +++ b/fs/xfs/libxfs/xfs_symlink_remote.c @@ -124,12 +124,9 @@ xfs_symlink_read_verify( if (!xfs_sb_version_hascrc(&mp->m_sb)) return; - if (!xfs_buf_verify_cksum(vc, bp, XFS_SYMLINK_CRC_OFF)) + if (!xfs_buf_verify_cksum(vc, bp, XFS_SYMLINK_CRC_OFF) || + !xfs_symlink_verify(vc, bp)) xfs_verifier_error(bp, vc); - else { - if (!xfs_symlink_verify(vc, bp)) - xfs_verifier_error(bp, vc); - } } static void

[10/10] xfs: condense crc and verifier checks where possible

Commit Message

Patch