svn commit: r350653 - head/sys/geom/label

[Kirk McKusick]

Author: mckusick
Date: Tue Aug  6 18:28:44 2019
New Revision: 350653
URL: https://svnweb.freebsd.org/changeset/base/350653

Log:
  Ignore UFS/FFS superblock check hash failures so as to allow a higher
  level in the filesystem stack to decide what to do about them.
  
  Reported by:  Peter Holm
  Tested by:    Peter Holm
  Sponsored by: Netflix

Modified:
  head/sys/geom/label/g_label_ufs.c

Modified: head/sys/geom/label/g_label_ufs.c
==============================================================================
--- head/sys/geom/label/g_label_ufs.c	Tue Aug  6 18:15:26 2019	(r350652)
+++ head/sys/geom/label/g_label_ufs.c	Tue Aug  6 18:28:44 2019	(r350653)
@@ -76,8 +76,8 @@ g_label_ufs_taste_common(struct g_consumer *cp, char *
 	label[0] = '\0';
 
 	fs = NULL;
-	if (SBLOCKSIZE % pp->sectorsize != 0 ||
-	    ffs_sbget(cp, &fs, STDSB, M_GEOM, g_use_g_read_data) != 0) {
+	if (SBLOCKSIZE % pp->sectorsize != 0 || ffs_sbget(cp, &fs,
+	    STDSB_NOHASHFAIL, M_GEOM, g_use_g_read_data) != 0) {
 		KASSERT(fs == NULL,
 		    ("g_label_ufs_taste_common: non-NULL fs %p\n", fs));
 		return;