From d0ca5d8a3875a423b522ee9767cbeb3d47bed420 Mon Sep 17 00:00:00 2001

From: Eric Sandeen <sandeen@redhat.com>

Date: Thu, 25 Jan 2018 13:55:01 -0600

Subject: [PATCH] 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>

---

 copy/xfs_copy.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c

index fb37375..16ee4d9 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);

 		}

 		/*

-- 

2.9.5