Blame SOURCES/xfsprogs-5.9.0-mkfs.xfs-fix-ASSERT-on-too-small-device-with-stripe.patch

d13294
From 97a4059660b27a9b0e3d8cdde5dbef8712685865 Mon Sep 17 00:00:00 2001
d13294
From: Pavel Reichl <preichl@redhat.com>
d13294
Date: Mon, 28 Sep 2020 17:31:18 -0400
d13294
Subject: [PATCH] mkfs.xfs: fix ASSERT on too-small device with stripe geometry
d13294
d13294
When a too-small device is created with stripe geometry, we hit an
d13294
assert in align_ag_geometry():
d13294
d13294
mkfs.xfs: xfs_mkfs.c:2834: align_ag_geometry: Assertion `cfg->agcount != 0' failed.
d13294
d13294
This is because align_ag_geometry() finds that the size of the last
d13294
(only) AG is too small, and attempts to trim it off.  Obviously 0
d13294
AGs is invalid, and we hit the ASSERT.
d13294
d13294
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
d13294
Suggested-by: Dave Chinner <dchinner@redhat.com>
d13294
Signed-off-by: Pavel Reichl <preichl@redhat.com>
d13294
Reviewed-by: Christoph Hellwig <hch@lst.de>
d13294
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
d13294
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
d13294
---
d13294
 include/xfs_multidisk.h | 14 +++++++-------
d13294
 mkfs/xfs_mkfs.c         |  6 +++---
d13294
 2 files changed, 10 insertions(+), 10 deletions(-)
d13294
d13294
Index: xfsprogs-5.0.0/include/xfs_multidisk.h
d13294
===================================================================
d13294
--- xfsprogs-5.0.0.orig/include/xfs_multidisk.h
d13294
+++ xfsprogs-5.0.0/include/xfs_multidisk.h
d13294
@@ -14,7 +14,6 @@
d13294
 #define	XFS_DFL_BLOCKSIZE_LOG	12		/* 4096 byte blocks */
d13294
 #define	XFS_DINODE_DFL_LOG	8		/* 256 byte inodes */
d13294
 #define	XFS_DINODE_DFL_CRC_LOG	9		/* 512 byte inodes for CRCs */
d13294
-#define	XFS_MIN_DATA_BLOCKS	100
d13294
 #define	XFS_MIN_INODE_PERBLOCK	2		/* min inodes per block */
d13294
 #define	XFS_DFL_IMAXIMUM_PCT	25		/* max % of space for inodes */
d13294
 #define	XFS_MIN_REC_DIRSIZE	12		/* 4096 byte dirblocks (V2) */
d13294
@@ -25,13 +24,14 @@
d13294
 						 * accept w/o warnings
d13294
 						 */
d13294
 
d13294
-#define XFS_AG_BYTES(bblog)	((long long)BBSIZE << (bblog))
d13294
-#define	XFS_AG_MIN_BYTES	((XFS_AG_BYTES(15)))	/* 16 MB */
d13294
-#define	XFS_AG_MAX_BYTES	((XFS_AG_BYTES(31)))	/* 1 TB */
d13294
-#define XFS_AG_MIN_BLOCKS(blog)	(XFS_AG_MIN_BYTES >> (blog))
d13294
-#define XFS_AG_MAX_BLOCKS(blog)	((XFS_AG_MAX_BYTES - 1) >> (blog))
d13294
+#define XFS_AG_BYTES(bblog)		((long long)BBSIZE << (bblog))
d13294
+#define	XFS_MIN_DATA_BLOCKS(cfg)	(XFS_AG_MIN_BLOCKS((cfg)->blocklog))
d13294
+#define	XFS_AG_MIN_BYTES		((XFS_AG_BYTES(15)))	/* 16 MB */
d13294
+#define	XFS_AG_MAX_BYTES		((XFS_AG_BYTES(31)))	/* 1 TB */
d13294
+#define XFS_AG_MIN_BLOCKS(blog)		(XFS_AG_MIN_BYTES >> (blog))
d13294
+#define XFS_AG_MAX_BLOCKS(blog)		((XFS_AG_MAX_BYTES - 1) >> (blog))
d13294
 
d13294
-#define XFS_MAX_AGNUMBER	((xfs_agnumber_t)(NULLAGNUMBER - 1))
d13294
+#define XFS_MAX_AGNUMBER		((xfs_agnumber_t)(NULLAGNUMBER - 1))
d13294
 
d13294
 /*
d13294
  * These values define what we consider a "multi-disk" filesystem. That is, a
d13294
Index: xfsprogs-5.0.0/mkfs/xfs_mkfs.c
d13294
===================================================================
d13294
--- xfsprogs-5.0.0.orig/mkfs/xfs_mkfs.c
d13294
+++ xfsprogs-5.0.0/mkfs/xfs_mkfs.c
d13294
@@ -2581,10 +2581,10 @@ _("size %s specified for data subvolume
d13294
 		cfg->dblocks = DTOBT(xi->dsize, cfg->blocklog);
d13294
 	}
d13294
 
d13294
-	if (cfg->dblocks < XFS_MIN_DATA_BLOCKS) {
d13294
+	if (cfg->dblocks < XFS_MIN_DATA_BLOCKS(cfg)) {
d13294
 		fprintf(stderr,
d13294
-_("size %lld of data subvolume is too small, minimum %d blocks\n"),
d13294
-			(long long)cfg->dblocks, XFS_MIN_DATA_BLOCKS);
d13294
+_("size %lld of data subvolume is too small, minimum %lld blocks\n"),
d13294
+			(long long)cfg->dblocks, XFS_MIN_DATA_BLOCKS(cfg));
d13294
 		usage();
d13294
 	}
d13294