From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 25 Jan 2018 19:55:01 +0000 (-0600)
Subject: xfs_copy: accept CRC version of ABTB_MAGIC in ASSERT
X-Git-Tag: v4.15.0-rc1~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0ca5d8a3875a423b522ee9767cbeb3d47bed420;p=thirdparty%2Fxfsprogs-dev.git

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>
---

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index fb37375db..16ee4d9c5 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);
 		}
 
 		/*