Blame SOURCES/xfsprogs-5.1.0-mkfs-validate-start-and-end-of-aligned-logs.patch

82babb
From 8da52988ad210958f21c178620bb1e44f1188cd0 Mon Sep 17 00:00:00 2001
82babb
From: "Darrick J. Wong" <darrick.wong@oracle.com>
82babb
Date: Tue, 25 Jun 2019 17:04:42 -0400
82babb
Subject: [PATCH] mkfs: validate start and end of aligned logs
82babb
82babb
Validate that the start and end of the log stay within a single AG if
82babb
we adjust either end to align to stripe units.
82babb
82babb
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
82babb
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
82babb
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
82babb
---
82babb
 mkfs/xfs_mkfs.c | 15 ++++++++++++++-
82babb
 1 file changed, 14 insertions(+), 1 deletion(-)
82babb
82babb
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
82babb
index ddb25ecc..468b8fde 100644
82babb
--- a/mkfs/xfs_mkfs.c
82babb
+++ b/mkfs/xfs_mkfs.c
82babb
@@ -3033,15 +3033,28 @@ align_internal_log(
82babb
 	struct xfs_mount	*mp,
82babb
 	int			sunit)
82babb
 {
82babb
+	uint64_t		logend;
82babb
+
82babb
 	/* round up log start if necessary */
82babb
 	if ((cfg->logstart % sunit) != 0)
82babb
 		cfg->logstart = ((cfg->logstart + (sunit - 1)) / sunit) * sunit;
82babb
 
82babb
+	/* If our log start overlaps the next AG's metadata, fail. */
82babb
+	if (!xfs_verify_fsbno(mp, cfg->logstart)) {
82babb
+			fprintf(stderr,
82babb
+_("Due to stripe alignment, the internal log start (%lld) cannot be aligned\n"
82babb
+  "within an allocation group.\n"),
82babb
+			(long long) cfg->logstart);
82babb
+		usage();
82babb
+	}
82babb
+
82babb
 	/* round up/down the log size now */
82babb
 	align_log_size(cfg, sunit);
82babb
 
82babb
 	/* check the aligned log still fits in an AG. */
82babb
-	if (cfg->logblocks > cfg->agsize - XFS_FSB_TO_AGBNO(mp, cfg->logstart)) {
82babb
+	logend = cfg->logstart + cfg->logblocks - 1;
82babb
+	if (XFS_FSB_TO_AGNO(mp, cfg->logstart) != XFS_FSB_TO_AGNO(mp, logend) ||
82babb
+	    !xfs_verify_fsbno(mp, logend)) {
82babb
 		fprintf(stderr,
82babb
 _("Due to stripe alignment, the internal log size (%lld) is too large.\n"
82babb
   "Must fit within an allocation group.\n"),
82babb
-- 
82babb
2.17.0
82babb