git: 6385cabd5be6 - main - Do not complain about incorrect cylinder group check-hashes when asked to add them to a filesystem.

[Kirk McKusick]

The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=6385cabd5be627c4f395e3abf215882aaeb36320

commit 6385cabd5be627c4f395e3abf215882aaeb36320
Author:     Kirk McKusick <mckusick at FreeBSD.org>
AuthorDate: 2021-03-12 06:44:33 +0000
Commit:     Kirk McKusick <mckusick at FreeBSD.org>
CommitDate: 2021-03-12 06:46:15 +0000

    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);