aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2018-01-25 13:55:01 -0600
committerEric Sandeen <sandeen@redhat.com>2018-01-25 13:55:01 -0600
commitd0ca5d8a3875a423b522ee9767cbeb3d47bed420 (patch)
tree488c3a28ca68b93995f99726568144511c5d7d58
parent12f365e22389e494b9be6cdf1382327b1d1b64ed (diff)
downloadxfsprogs-dev-d0ca5d8a3875a423b522ee9767cbeb3d47bed420.tar.gz
xfs_copy: accept CRC version of ABTB_MAGIC in ASSERT
Not sure how this was missed for so long, but to handle CRC filesystems, this ASSERT on block magic must accept CRC magic as well. Reported-by: Radek Burkat <radek@pinkbike.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Bill O'Donnell <billodo@redhat.com> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r--copy/xfs_copy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index fb37375db0..16ee4d9c51 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -1140,7 +1140,8 @@ main(int argc, char **argv)
((char *) btree_buf.data +
pos - btree_buf.position);
- ASSERT(be32_to_cpu(block->bb_magic) == XFS_ABTB_MAGIC);
+ ASSERT(be32_to_cpu(block->bb_magic) == XFS_ABTB_MAGIC ||
+ be32_to_cpu(block->bb_magic) == XFS_ABTB_CRC_MAGIC);
}
/*