From f43aa5faf71b05bec443dbb0af363ddeaff8ec17 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Sat, 12 Mar 2022 01:42:13 +0200 Subject: 14562 apparently bad merge in l2arc_write_buffers Reviewed by: Andy Fiddaman Approved by: Dan McDonald --- usr/src/uts/common/fs/zfs/arc.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'usr/src') diff --git a/usr/src/uts/common/fs/zfs/arc.c b/usr/src/uts/common/fs/zfs/arc.c index 24b578c208..bf8b77f268 100644 --- a/usr/src/uts/common/fs/zfs/arc.c +++ b/usr/src/uts/common/fs/zfs/arc.c @@ -8576,12 +8576,6 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz) continue; } - /* - * We rely on the L1 portion of the header below, so - * it's invalid for this header to have been evicted out - * of the ghost cache, prior to being written out. The - * ARC_FLAG_L2_WRITING bit ensures this won't happen. - */ ASSERT(HDR_HAS_L1HDR(hdr)); ASSERT3U(HDR_GET_PSIZE(hdr), >, 0); @@ -8605,12 +8599,6 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz) * ARC_FLAG_L2_WRITING bit ensures this won't happen. */ arc_hdr_set_flags(hdr, ARC_FLAG_L2_WRITING); - ASSERT(HDR_HAS_L1HDR(hdr)); - - ASSERT3U(HDR_GET_PSIZE(hdr), >, 0); - ASSERT(hdr->b_l1hdr.b_pabd != NULL || - HDR_HAS_RABD(hdr)); - ASSERT3U(arc_hdr_size(hdr), >, 0); /* * If this header has b_rabd, we can use this since it -- cgit v1.2.3 From d3477c6d12fcb86e8bb78faf6993ae16c81cbe12 Mon Sep 17 00:00:00 2001 From: "Joshua M. Clulow" Date: Sun, 16 Aug 2015 14:41:32 -0700 Subject: 14576 absent framebuffer prevents console-login on all serial ports Reviewed by: Andy Fiddaman Reviewed by: Toomas Soome Approved by: Dan McDonald --- usr/src/cmd/svc/milestone/console-login | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'usr/src') diff --git a/usr/src/cmd/svc/milestone/console-login b/usr/src/cmd/svc/milestone/console-login index 4c87b6332b..81010231b5 100644 --- a/usr/src/cmd/svc/milestone/console-login +++ b/usr/src/cmd/svc/milestone/console-login @@ -23,6 +23,7 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2015 Joyent, Inc. # # This method script manages all vt logins including system # console login. @@ -38,18 +39,29 @@ . /lib/svc/share/smf_include.sh -if [ "$1" != "default" ]; then - if smf_dont_configure_vt; then - /usr/sbin/svcadm disable $SMF_FMRI - exit $SMF_EXIT_OK - fi -fi - getproparg() { val=`svcprop -p $2 $SMF_FMRI` [ -n "$val" ] && [ "$val" != "\"\"" ] && echo $1 $val } +# The service configuration invokes this script with "%i", the name of the +# instance, as the first argument. +instance="$1" +if [ -z "$instance" ]; then + exit $SMF_EXIT_ERR_CONFIG +fi + +case "$instance" in +vt*) + # This instance is for one of the virtual terminal devices. Check to + # see if the vt subsystem is initialised: + if smf_dont_configure_vt; then + /usr/sbin/svcadm disable "$SMF_FMRI" + exit $SMF_EXIT_OK + fi + ;; +esac + args="-g" val=`svcprop -p ttymon/device $SMF_FMRI` -- cgit v1.2.3