From 6385cabd5be627c4f395e3abf215882aaeb36320 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Thu, 11 Mar 2021 22:44:33 -0800
Subject: [PATCH] Do not complain about incorrect cylinder group check-hashes
 when asked to add them to a filesystem.

MFC after:    3 days
Sponsored by: Netflix
---
 sbin/fsck_ffs/fsutil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 77571deb38f4..127884400651 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -926,7 +926,8 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild)
 	 * Extended cylinder group checks.
 	 */
 	calchash = cgp->cg_ckhash;
-	if ((sblock.fs_metackhash & CK_CYLGRP) != 0) {
+	if ((sblock.fs_metackhash & CK_CYLGRP) != 0 &&
+	    (ckhashadd & CK_CYLGRP) == 0) {
 		cghash = cgp->cg_ckhash;
 		cgp->cg_ckhash = 0;
 		calchash = calculate_crc32c(~0L, (void *)cgp, sblock.fs_cgsize);