summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorEric Sandeen2019-02-04 17:54:27 +0100
committerGreg Kroah-Hartman2019-02-12 19:47:21 +0100
commit0c802cbaa6db4203fc559829548e19ae5ee8c9c2 (patch)
treed6ebf195bae65ce8a4704df28f71b5e66bcfd6a2 /fs/xfs
parentxfs: fix PAGE_MASK usage in xfs_free_file_space (diff)
downloadkernel-qcow2-linux-0c802cbaa6db4203fc559829548e19ae5ee8c9c2.tar.gz
kernel-qcow2-linux-0c802cbaa6db4203fc559829548e19ae5ee8c9c2.tar.xz
kernel-qcow2-linux-0c802cbaa6db4203fc559829548e19ae5ee8c9c2.zip
xfs: fix inverted return from xfs_btree_sblock_verify_crc
commit 7d048df4e9b05ba89b74d062df59498aa81f3785 upstream. xfs_btree_sblock_verify_crc is a bool so should not be returning a failaddr_t; worse, if xfs_log_check_lsn fails it returns __this_address which looks like a boolean true (i.e. success) to the caller. (interestingly xfs_btree_lblock_verify_crc doesn't have the issue) 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> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/libxfs/xfs_btree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 34c6d7bd4d18..bbdae2b4559f 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -330,7 +330,7 @@ xfs_btree_sblock_verify_crc(
if (xfs_sb_version_hascrc(&mp->m_sb)) {
if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.s.bb_lsn)))
- return __this_address;
+ return false;
return xfs_buf_verify_cksum(bp, XFS_BTREE_SBLOCK_CRC_OFF);
}