git: 7dd29d256ff7 - stable/13 - Do not complain about incorrect cylinder group check-hashes when asked to add them to a filesystem.
Kirk McKusick
mckusick at FreeBSD.org
Sun Mar 14 22:16:12 UTC 2021
The branch stable/13 has been updated by mckusick:
URL: https://cgit.FreeBSD.org/src/commit/?id=7dd29d256ff7640688ff591b4a8f6379e2dbc4dc
commit 7dd29d256ff7640688ff591b4a8f6379e2dbc4dc
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-14 22:18:02 +0000
Do not complain about incorrect cylinder group check-hashes when
asked to add them to a filesystem.
Sponsored by: Netflix
(cherry picked from commit 6385cabd5be627c4f395e3abf215882aaeb36320)
---
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);
More information about the dev-commits-src-all
mailing list