svn commit: r366592 - in stable/12: stand/efi/loader stand/libsa/zfs usr.bin/netstat

[Allan Jude]

Author: allanjude
Date: Fri Oct  9 22:59:27 2020
New Revision: 366592
URL: https://svnweb.freebsd.org/changeset/base/366592

Log:
  Clean up the mess I made with r366590 and r366591

Modified:
  stable/12/stand/efi/loader/main.c
  stable/12/stand/libsa/zfs/zfsimpl.c
  stable/12/usr.bin/netstat/route.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/stand/efi/loader/main.c
==============================================================================
--- stable/12/stand/efi/loader/main.c	Fri Oct  9 22:50:16 2020	(r366591)
+++ stable/12/stand/efi/loader/main.c	Fri Oct  9 22:59:27 2020	(r366592)
@@ -717,6 +717,10 @@ parse_uefi_con_out(void)
 	ep = buf + sz;
 	node = (EFI_DEVICE_PATH *)buf;
 	while ((char *)node < ep) {
+		if (IsDevicePathEndType(node)) {
+			if (pci_pending && vid_seen == 0)
+				vid_seen = ++seen;
+		}
 		pci_pending = false;
 		if (DevicePathType(node) == ACPI_DEVICE_PATH &&
 		    DevicePathSubType(node) == ACPI_DP) {
@@ -749,8 +753,6 @@ parse_uefi_con_out(void)
 		}
 		node = NextDevicePathNode(node); /* Skip the end node */
 	}
-	if (pci_pending && vid_seen == 0)
-		vid_seen = ++seen;
 
 	/*
 	 * Truth table for RB_MULTIPLE | RB_SERIAL

Modified: stable/12/stand/libsa/zfs/zfsimpl.c
==============================================================================
--- stable/12/stand/libsa/zfs/zfsimpl.c	Fri Oct  9 22:50:16 2020	(r366591)
+++ stable/12/stand/libsa/zfs/zfsimpl.c	Fri Oct  9 22:59:27 2020	(r366592)
@@ -127,8 +127,6 @@ static const char *features_for_read[] = {
 	"com.delphix:device_removal",
 	"com.delphix:obsolete_counts",
 	"com.intel:allocation_classes",
-	"org.freebsd:zstd_compress",
-	"com.datto:encryption",
 	NULL
 };
 

Modified: stable/12/usr.bin/netstat/route.c
==============================================================================
--- stable/12/usr.bin/netstat/route.c	Fri Oct  9 22:50:16 2020	(r366591)
+++ stable/12/usr.bin/netstat/route.c	Fri Oct  9 22:59:27 2020	(r366592)
@@ -772,7 +772,12 @@ rt_stats(void)
 		xo_emit("{W:rtstat: symbol not in namelist}\n");
 		return;
 	}
+	if ((rttaddr = nl[N_RTTRASH].n_value) == 0) {
+		xo_emit("{W:rttrash: symbol not in namelist}\n");
+		return;
+	}
 	kread(rtsaddr, (char *)&rtstat, sizeof (rtstat));
+	kread(rttaddr, (char *)&rttrash, sizeof (rttrash));
 	xo_emit("{T:routing}:\n");
 
 #define	p(f, m) if (rtstat.f || sflag <= 1) \
@@ -788,17 +793,7 @@ rt_stats(void)
 	    "{N:/destination%s found unreachable}\n");
 	p(rts_wildcard, "\t{:wildcard-uses/%hu} "
 	    "{N:/use%s of a wildcard route}\n");
-	p(rts_nh_idx_alloc_failure, "\t{:nexthop-index-alloc-failures/%hu} "
-	    "{N:/nexthop index alloc failure%s}\n");
-	p(rts_nh_alloc_failure, "\t{:nexthop-alloc-failures/%hu} "
-	    "{N:/nexthop allocation failure%s}\n");
 #undef p
-
-	if ((rttaddr = nl[N_RTTRASH].n_value) == 0) {
-		xo_emit("{W:rttrash: symbol not in namelist}\n");
-		return;
-	}
-	kread(rttaddr, (char *)&rttrash, sizeof (rttrash));
 
 	if (rttrash || sflag <= 1)
 		xo_emit("\t{:unused-but-not-freed/%u} "