From 68d504563fc5472bdcfe2bd9b042328a266595ed Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 12 2019 16:32:13 +0000
Subject: import xfsprogs-4.5.0-19.el7_6


---

diff --git a/SOURCES/xfsprogs-4.15.0-xfs_copy-accept-CRC-version-of-ABTB_MAGIC-in-ASSERT.patch b/SOURCES/xfsprogs-4.15.0-xfs_copy-accept-CRC-version-of-ABTB_MAGIC-in-ASSERT.patch
new file mode 100644
index 0000000..e4492ea
--- /dev/null
+++ b/SOURCES/xfsprogs-4.15.0-xfs_copy-accept-CRC-version-of-ABTB_MAGIC-in-ASSERT.patch
@@ -0,0 +1,35 @@
+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
+
diff --git a/SPECS/xfsprogs.spec b/SPECS/xfsprogs.spec
index 44c5dd9..0fe5982 100644
--- a/SPECS/xfsprogs.spec
+++ b/SPECS/xfsprogs.spec
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	4.5.0
-Release:	18%{?dist}
+Release:	19%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -55,6 +55,7 @@ Patch29:	xfsprogs-4.15.0-xfsprogs-update-dead-urls.patch
 Patch30:	xfsprogs-4.17.0-xfsprogs-be-careful-about-what-we-stat-in-platform_c.patch
 Patch31:	xfsprogs-4.17.0-xfs_io-add-label-command.patch
 Patch32:	xfsprogs-4.18-repair-root-parent.patch
+Patch33:	xfsprogs-4.15.0-xfs_copy-accept-CRC-version-of-ABTB_MAGIC-in-ASSERT.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -114,6 +115,7 @@ also want to install xfsprogs.
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 %build
 export tagname=CC
@@ -179,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 11 2019 Eric Sandeen <sandeen@redhat.com> 4.5.0-19
+- xfs_copy: accept CRC version of ABTB_MAGIC in ASSERT (#1641023)
+
 * Wed Jun 20 2018 Eric Sandeen <sandeen@redhat.com> 4.5.0-18
 - xfs_repar: Fix root inode's parent for sf directory (#1590334)