import xfsprogs-5.0.0-12.el8

SOURCES/xfsprogs-5.10.0-xfs_repair-fix-progress-reporting.patch

@@ -0,0 +1,177 @@
+From a4d94d6c30acac66ff82e740e2dcb95736d7d195 Mon Sep 17 00:00:00 2001
+From: Eric Sandeen <sandeen@redhat.com>
+Date: Tue, 26 May 2020 14:36:04 -0400
+Subject: [PATCH] xfs_repair: fix progress reporting
+
+The Fixes: commit tried to avoid a segfault in case the progress timer
+went off before the first message type had been set up, but this
+had the net effect of short-circuiting the pthread start routine,
+and so the timer didn't get set up at all and we lost all fine-grained
+progress reporting.
+
+The initial problem occurred when log zeroing took more time than the
+timer interval.
+
+So, make a new log zeroing progress item and initialize it when we first
+set up the timer thread, to be sure that if the timer goes off while we
+are still zeroing the log, it will be initialized and correct.
+
+(We can't offer fine-grained status on log zeroing, so it'll go from
+zero to $LOGBLOCKS with nothing in between, but it's unlikely that log
+zeroing will take so long that this really matters.)
+
+Reported-by: Leonardo Vaz <lvaz@redhat.com>
+Fixes: 7f2d6b811755 ("xfs_repair: avoid segfault if reporting progre...")
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
+Reviewed-by: Donald Douwsma <ddouwsma@redhat.com>
+Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
+Signed-off-by: Pavel Reichl <preichl@redhat.com>
+---
+ repair/phase2.c   |  6 ++++++
+ repair/progress.c | 35 +++++++++++++++++++----------------
+ repair/progress.h | 31 ++++++++++++++++---------------
+ 3 files changed, 41 insertions(+), 31 deletions(-)
+
+diff --git a/repair/phase2.c b/repair/phase2.c
+index 40ea2f84..952ac4a5 100644
+--- a/repair/phase2.c
++++ b/repair/phase2.c
+@@ -120,6 +120,9 @@ zero_log(
+ 			do_error(_("failed to clear log"));
+ 	}
+ 
++	/* And we are now magically complete! */
++	PROG_RPT_INC(prog_rpt_done[0], mp->m_sb.sb_logblocks);
++
+ 	/*
+ 	 * Finally, seed the max LSN from the current state of the log if this
+ 	 * is a v5 filesystem.
+@@ -160,7 +163,10 @@ phase2(
+ 
+ 	/* Zero log if applicable */
+ 	do_log(_("        - zero log...\n"));
++
++	set_progress_msg(PROG_FMT_ZERO_LOG, (uint64_t)mp->m_sb.sb_logblocks);
+ 	zero_log(mp);
++	print_final_rpt();
+ 
+ 	do_log(_("        - scan filesystem freespace and inode maps...\n"));
+ 
+diff --git a/repair/progress.c b/repair/progress.c
+index 5ee08229..e5a9c1ef 100644
+--- a/repair/progress.c
++++ b/repair/progress.c
+@@ -49,35 +49,37 @@ typedef struct progress_rpt_s {
+ 
+ static
+ progress_rpt_t progress_rpt_reports[] = {
+-{FMT1, N_("scanning filesystem freespace"),			/*  0 */
++{FMT1, N_("zeroing log"),					/*  0 */
++	&rpt_fmts[FMT1], &rpt_types[TYPE_BLOCK]},
++{FMT1, N_("scanning filesystem freespace"),			/*  1 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT1, N_("scanning agi unlinked lists"),			/*  1 */
++{FMT1, N_("scanning agi unlinked lists"),			/*  2 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT2, N_("check uncertain AG inodes"),				/*  2 */
++{FMT2, N_("check uncertain AG inodes"),				/*  3 */
+ 	&rpt_fmts[FMT2], &rpt_types[TYPE_AGI_BUCKET]},
+-{FMT1, N_("process known inodes and inode discovery"),		/*  3 */
++{FMT1, N_("process known inodes and inode discovery"),		/*  4 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_INODE]},
+-{FMT1, N_("process newly discovered inodes"),			/*  4 */
++{FMT1, N_("process newly discovered inodes"),			/*  5 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT1, N_("setting up duplicate extent list"),			/*  5 */
++{FMT1, N_("setting up duplicate extent list"),			/*  6 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT1, N_("initialize realtime bitmap"),			/*  6 */
++{FMT1, N_("initialize realtime bitmap"),			/*  7 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_BLOCK]},
+-{FMT1, N_("reset realtime bitmaps"),				/*  7 */
++{FMT1, N_("reset realtime bitmaps"),				/*  8 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT1, N_("check for inodes claiming duplicate blocks"),	/*  8 */
++{FMT1, N_("check for inodes claiming duplicate blocks"),	/*  9 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_INODE]},
+-{FMT1, N_("rebuild AG headers and trees"),	 		/*  9 */
++{FMT1, N_("rebuild AG headers and trees"),	 		/* 10 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT1, N_("traversing filesystem"),				/* 10 */
++{FMT1, N_("traversing filesystem"),				/* 12 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT2, N_("traversing all unattached subtrees"),		/* 11 */
++{FMT2, N_("traversing all unattached subtrees"),		/* 12 */
+ 	&rpt_fmts[FMT2], &rpt_types[TYPE_DIR]},
+-{FMT2, N_("moving disconnected inodes to lost+found"),		/* 12 */
++{FMT2, N_("moving disconnected inodes to lost+found"),		/* 13 */
+ 	&rpt_fmts[FMT2], &rpt_types[TYPE_INODE]},
+-{FMT1, N_("verify and correct link counts"),			/* 13 */
++{FMT1, N_("verify and correct link counts"),			/* 14 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
+-{FMT1, N_("verify link counts"),				/* 14 */
++{FMT1, N_("verify link counts"),				/* 15 */
+ 	&rpt_fmts[FMT1], &rpt_types[TYPE_AG]}
+ };
+ 
+@@ -125,7 +127,8 @@ init_progress_rpt (void)
+ 	 */
+ 
+ 	pthread_mutex_init(&global_msgs.mutex, NULL);
+-	global_msgs.format = NULL;
++	/* Make sure the format is set to the first phase and not NULL */
++	global_msgs.format = &progress_rpt_reports[PROG_FMT_ZERO_LOG];
+ 	global_msgs.count = glob_agcount;
+ 	global_msgs.interval = report_interval;
+ 	global_msgs.done   = prog_rpt_done;
+diff --git a/repair/progress.h b/repair/progress.h
+index 9de9eb72..2c1690db 100644
+--- a/repair/progress.h
++++ b/repair/progress.h
+@@ -8,26 +8,27 @@
+ #define	PHASE_END		1
+ 
+ 
+-#define	PROG_FMT_SCAN_AG 	0	/* Phase 2 */
++#define	PROG_FMT_ZERO_LOG	0	/* Phase 2 */
++#define	PROG_FMT_SCAN_AG 	1
+ 
+-#define	PROG_FMT_AGI_UNLINKED 	1	/* Phase 3 */
+-#define	PROG_FMT_UNCERTAIN      2
+-#define	PROG_FMT_PROCESS_INO	3
+-#define	PROG_FMT_NEW_INODES	4
++#define	PROG_FMT_AGI_UNLINKED 	2	/* Phase 3 */
++#define	PROG_FMT_UNCERTAIN      3
++#define	PROG_FMT_PROCESS_INO	4
++#define	PROG_FMT_NEW_INODES	5
+ 
+-#define	PROG_FMT_DUP_EXTENT	5	/* Phase 4 */
+-#define	PROG_FMT_INIT_RTEXT	6
+-#define	PROG_FMT_RESET_RTBM	7
+-#define	PROG_FMT_DUP_BLOCKS	8
++#define	PROG_FMT_DUP_EXTENT	6	/* Phase 4 */
++#define	PROG_FMT_INIT_RTEXT	7
++#define	PROG_FMT_RESET_RTBM	8
++#define	PROG_FMT_DUP_BLOCKS	9
+ 
+-#define	PROG_FMT_REBUILD_AG	9	/* Phase 5 */
++#define	PROG_FMT_REBUILD_AG	10	/* Phase 5 */
+ 
+-#define	PROG_FMT_TRAVERSAL	10	/* Phase 6 */
+-#define	PROG_FMT_TRAVERSSUB	11
+-#define	PROG_FMT_DISCONINODE	12
++#define	PROG_FMT_TRAVERSAL	11	/* Phase 6 */
++#define	PROG_FMT_TRAVERSSUB	12
++#define	PROG_FMT_DISCONINODE	13
+ 
+-#define	PROGRESS_FMT_CORR_LINK	13	/* Phase 7 */
+-#define	PROGRESS_FMT_VRFY_LINK 	14
++#define	PROGRESS_FMT_CORR_LINK	14	/* Phase 7 */
++#define	PROGRESS_FMT_VRFY_LINK 	15
+ 
+ #define	DURATION_BUF_SIZE	512
+ 
+-- 
+2.40.1
+

SOURCES/xfsprogs-5.19.0-mkfs-terminate-getsubopt-arrays-properly.patch

@@ -0,0 +1,112 @@
+From 50dba8189b1f628073eb61d824ae8a8a1b43cefb Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <djwong@kernel.org>
+Date: Wed, 13 Jul 2022 20:58:28 -0500
+Subject: [PATCH] mkfs: terminate getsubopt arrays properly
+
+Having not drank any (or maybe too much) coffee this morning, I typed:
+
+$ mkfs.xfs -d agcount=3 -d nrext64=0
+Segmentation fault
+
+I traced this down to getsubopt walking off the end of the dopts.subopts
+array.  The manpage says you're supposed to terminate the suboptions
+string array with a NULL entry, but the structure definition uses
+MAX_SUBOPTS/D_MAX_OPTS directly, which means there is no terminator.
+
+Explicitly terminate each suboption array with a NULL entry after
+making room for it.
+
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+[sandeen: explicitly add NULL terminators & clarify comment]
+Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
+Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
+Signed-off-by: Pavel Reichl <preichl@redhat.com>
+---
+ mkfs/xfs_mkfs.c | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
+index db322b3a..b140b815 100644
+--- a/mkfs/xfs_mkfs.c
++++ b/mkfs/xfs_mkfs.c
+@@ -140,8 +140,11 @@ enum {
+ 	M_MAX_OPTS,
+ };
+ 
+-/* Just define the max options array size manually right now */
+-#define MAX_SUBOPTS	D_MAX_OPTS
++/*
++ * Just define the max options array size manually to the largest
++ * enum right now, leaving room for a NULL terminator at the end
++ */
++#define MAX_SUBOPTS	(D_MAX_OPTS + 1)
+ 
+ #define SUBOPT_NEEDS_VAL	(-1LL)
+ #define MAX_CONFLICTS	8
+@@ -251,6 +254,7 @@ static struct opt_params bopts = {
+ 	.name = 'b',
+ 	.subopts = {
+ 		[B_SIZE] = "size",
++		[B_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = B_SIZE,
+@@ -306,6 +311,7 @@ static struct opt_params dopts = {
+		[D_PROJINHERIT] = "projinherit",
+ 		[D_EXTSZINHERIT] = "extszinherit",
+ 		[D_COWEXTSIZE] = "cowextsize",
++		[D_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = D_AGCOUNT,
+@@ -443,6 +449,7 @@ static struct opt_params iopts = {
+		[I_ATTR] = "attr",
+		[I_PROJID32BIT] = "projid32bit",
+		[I_SPINODES] = "sparse",
++		[I_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = I_ALIGN,
+@@ -515,6 +522,7 @@ static struct opt_params lopts = {
+ 		[L_FILE] = "file",
+ 		[L_NAME] = "name",
+ 		[L_LAZYSBCNTR] = "lazy-count",
++		[L_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = L_AGNUM,
+@@ -607,6 +615,7 @@ static struct opt_params nopts = {
+ 		[N_SIZE] = "size",
+ 		[N_VERSION] = "version",
+ 		[N_FTYPE] = "ftype",
++		[N_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = N_SIZE,
+@@ -642,6 +651,7 @@ static struct opt_params ropts = {
+ 		[R_FILE] = "file",
+ 		[R_NAME] = "name",
+ 		[R_NOALIGN] = "noalign",
++		[R_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = R_EXTSIZE,
+@@ -689,6 +699,7 @@ static struct opt_params sopts = {
+ 	.subopts = {
+ 		[S_SIZE] = "size",
+ 		[S_SECTSIZE] = "sectsize",
++		[S_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = S_SIZE,
+@@ -725,6 +736,7 @@ static struct opt_params mopts = {
+ 		[M_REFLINK] = "reflink",
+ 		[M_INOBTCNT] = "inobtcount",
+ 		[M_BIGTIME] = "bigtime",
++		[M_MAX_OPTS] = NULL,
+ 	},
+ 	.subopt_params = {
+ 		{ .index = M_CRC,
+-- 
+2.40.1
+

SOURCES/xfsprogs-5.19.0-xfs_repair-ignore-empty-xattr-leaf-blocks.patch

@@ -0,0 +1,56 @@
+From f50d3462c654acc484ab3ea68e75e8252b77e262 Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <djwong@kernel.org>
+Date: Wed, 13 Jul 2022 20:58:25 -0500
+Subject: [PATCH] xfs_repair: ignore empty xattr leaf blocks
+
+As detailed in the commit:
+
+5e572d1a xfs: empty xattr leaf header blocks are not corruption
+
+empty xattr leaf blocks can be the benign byproduct of the system
+going down during the multi-step process of adding a large xattr
+to a file that has no xattrs.  If we find one at attr fork offset 0,
+we should clear it, but this isn't a corruption.
+
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+Reviewed-by: Dave Chinner <dchinner@redhat.com>
+Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
+Signed-off-by: Pavel Reichl <preichl@redhat.com>
+---
+ repair/attr_repair.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/repair/attr_repair.c b/repair/attr_repair.c
+index 2055d96e..c3a6d502 100644
+--- a/repair/attr_repair.c
++++ b/repair/attr_repair.c
+@@ -579,6 +579,26 @@ process_leaf_attr_block(
+ 	firstb = mp->m_sb.sb_blocksize;
+ 	stop = xfs_attr3_leaf_hdr_size(leaf);
+ 
++	/*
++	 * Empty leaf blocks at offset zero can occur as a race between
++	 * setxattr and the system going down, so we only take action if we're
++	 * running in modify mode.  See xfs_attr3_leaf_verify for details of
++	 * how we've screwed this up many times.
++	 */
++	if (!leafhdr.count && da_bno == 0) {
++		if (no_modify) {
++			do_log(
++	_("would clear empty leaf attr block 0, inode %" PRIu64 "\n"),
++					ino);
++			return 0;
++		}
++
++		do_warn(
++	_("will clear empty leaf attr block 0, inode %" PRIu64 "\n"),
++				ino);
++		return 1;
++	}
++
+ 	/* does the count look sorta valid? */
+ 	if (!leafhdr.count ||
+ 	    leafhdr.count * sizeof(xfs_attr_leaf_entry_t) + stop >
+-- 
+2.40.1
+

SOURCES/xfsprogs-rhelonly-mkfs-fix-man-s-default-value-for-sparse-option.patch

@@ -0,0 +1,28 @@
+From 31980fef484df925b23824244de8ef353e436cef Mon Sep 17 00:00:00 2001
+From: Pavel Reichl <preichl@redhat.com>
+Date: Thu, 8 Jun 2023 10:57:52 +0200
+Subject: [PATCH] mkfs: fix man's default value for sparse option
+
+Fixes: 9cf846b51 ("mkfs: enable sparse inodes by default")
+Suggested-by: Lukas Herbolt <lukas@herbolt.com>
+Signed-off-by: Pavel Reichl <preichl@redhat.com>
+---
+ man/man8/mkfs.xfs.8 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8
+index 49e64d47a..48e26ece7 100644
+--- a/man/man8/mkfs.xfs.8
++++ b/man/man8/mkfs.xfs.8
+@@ -631,7 +631,7 @@ Enable sparse inode chunk allocation. The
+ .I value
+ is either 0 or 1, with 1 signifying that sparse allocation is enabled.
+ If the value is omitted, 1 is assumed. Sparse inode allocation is
+-disabled by default. This feature is only available for filesystems
++enabled by default. This feature is only available for filesystems
+ formatted with
+ .B \-m crc=1.
+ .IP
+-- 
+2.40.1
+

SPECS/xfsprogs.spec

@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	5.0.0
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPL+ and LGPLv2+
 Group:		System Environment/Base
 URL:		https://xfs.wiki.kernel.org
@@ -80,7 +80,11 @@ Patch59:	xfsprogs-5.13.0-xfs-rename-struct-xfs_legacy_ictimestamp.patch
 Patch60:	xfsprogs-5.11.0-mkfs-fix-wrong-inobtcount-usage-error-output.patch
 Patch61:	xfsprogs-5.12.0-libxfs-expose-inobtcount-in-xfs-geometry.patch
 Patch62:	xfsprogs-5.12.0-libfrog-report-inobtcount-in-geometry.patch
-Patch63:	xfsprogs-5.9.0-xfs-ignore-autofs-mount-table-entries.patch
+Patch63:	xfsprogs-5.19.0-xfs_repair-ignore-empty-xattr-leaf-blocks.patch
+Patch64:	xfsprogs-5.19.0-mkfs-terminate-getsubopt-arrays-properly.patch
+Patch65:	xfsprogs-5.9.0-xfs-ignore-autofs-mount-table-entries.patch
+Patch66:	xfsprogs-5.10.0-xfs_repair-fix-progress-reporting.patch
+Patch67:	xfsprogs-rhelonly-mkfs-fix-man-s-default-value-for-sparse-option.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -175,6 +179,10 @@ also want to install xfsprogs.
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
+%patch67 -p1
 
 %build
 export tagname=CC
@@ -234,11 +242,16 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/man8/xfs_scrub*
 %{_libdir}/*.so
 
 %changelog
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 5.0.0-11
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 5.0.0-12
 - Rebuilt for MSVSphere 8.8
 
-* Fri May 19 2023 Pavel Reichl <preichl@redhat.com> - 5.0.0-11
+* Thu Jun 08 2023 Pavel Reichl <preichl@redhat.com> - 5.0.0-12
-- Fix ignore autofs mount table entries (#2208391)
+- Fix xfs_repair progress reporting is not working (#2183398)
+- Fix man page default for sparse mkfs option (#2118564)
+
+* Tue May 02 2023 Pavel Reichl <preichl@redhat.com> - 5.0.0-11
+- Fix xfstest fails with error "missing xfsprogs fix patch"(#2161936,#2160746)
+- Fix ignore autofs mount table entries (#2182361)
 
 * Thu Dec 09 2021 Bill O'Donnell <bodonnel@redhat.com> 5.0.0-10
 - xfsprogs: enable bigtime and inode btree counter features in RHEL8 (#2024201))