From nobody Mon Mar 13 15:53:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pb1Qp6WCSz3xsbJ; Mon, 13 Mar 2023 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pb1Qp5tDlz47g7; Mon, 13 Mar 2023 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678722802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vp0bQqLuyZJSXEq+dECdZDis0hHhqpML63aOeyWvm3o=; b=tpvcs/D2OHI8WVcMJU6g9UiQ7M0UjR9hYNjYKp0t9Hd4wC167NgHeNsWosS8Nq01o+zrQ0 MsU34Yu+NcuG4LZ5RN9TCBydXOJ0+/DlLcInQ631rHA9ZrKACqdskDYhx/PtxMy8P0Mnds sZzyj6BKTw5u8QhZKtOMtq3QfiM3tjsA3s1vbSJZD37rGWeeWEtDu4ziNqA5th+XXeQ4Ua rgmAhSoi7d7ydlWEc+Q+QKthxsE/muZpXv3w01B+gciQ+w4cLjJU9qVHlwUdn21E91TlC7 u2gH5NAPlEtyBg+jzBzN6H/FK6CQeCGBPgmgcGtzfBsPsXD0lXo6j4xPASe+XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678722802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vp0bQqLuyZJSXEq+dECdZDis0hHhqpML63aOeyWvm3o=; b=nnczIXC5fwjb3oCVD6TJgRb33N7SAP0d0izr64EFFyC3pcEs8FQ160Bde2uxqGPc9hExsE 0XlTTMTMpSw8dc4xTJm/2/n4y7eaIQOyh468kkw5DCoZAVWPJyQ4qmLo2WWuJABN4gDCik ndbX0uaZWf5i8uG7bTLzLqa+sBHnGf2hB8K20nF8T/+9hqQzqcStWAKFFipxhwZyjBjn3x KmjXjbF/NctjJG07xYw9ho+r4vZp4D5Mc2suRv2kF55NPG7Inwiijc6slrKmU1Y01nhaXm tmLg7G1QoayxLFc4wKIzABNJIXtHCnyuvuEJOVZQqpZeeMWTlf8Nc/7cwOIASA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678722802; a=rsa-sha256; cv=none; b=XYuJ4QvMK14Z9JUIqDdFZrWH+dk1Ck6tXeoy/MEo9SUnoRdek6ynOv4A1TEGQsPF3LBx0p 58oDZLrVj0RJONIriwGWVY72gbqbBp1Hbat4oxnjaHuQ4C0iGMiRLY2U+tHOZOEUpHPXAI ZUdzNPudsSqZ/QhT4UilCoEwY99j0imh9B2K5M29umBouypRLGg7ghIWOK4z71ub7i1P2t nzjRwGRcDBVRcO8VPI9af+R9oxhJpH+q0P4sF7Fwh72eSHBrH13s1wZRpuZNztbhafrUzL kZj3C3A/7wcXjg4IBzPvV+d1nkeS47kkNTJ/6sGK7jQTacqP8h6HFuOlC8pSsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pb1Qp4wn1z10DW; Mon, 13 Mar 2023 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32DFrMvO039762; Mon, 13 Mar 2023 15:53:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DFrMxp039761; Mon, 13 Mar 2023 15:53:22 GMT (envelope-from git) Date: Mon, 13 Mar 2023 15:53:22 GMT Message-Id: <202303131553.32DFrMxp039761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: db7f871eea7f - stable/13 - buf: Make buf_daemon_shutdown() a no-op after a panic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db7f871eea7f29d2769e5bf67dc350d6b978b7ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db7f871eea7f29d2769e5bf67dc350d6b978b7ba commit db7f871eea7f29d2769e5bf67dc350d6b978b7ba Author: Mark Johnston AuthorDate: 2023-03-01 15:07:56 +0000 Commit: Mark Johnston CommitDate: 2023-03-13 15:53:15 +0000 buf: Make buf_daemon_shutdown() a no-op after a panic As in commit 9d7cc536e261a7, there is no need to do anything in this context. MFC after: 1 week (cherry picked from commit bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4) --- sys/kern/vfs_bio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 98047f161077..174a6e0b556a 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3406,6 +3406,9 @@ buf_daemon_shutdown(void *arg __unused, int howto __unused) { int error; + if (KERNEL_PANICKED()) + return; + mtx_lock(&bdlock); bd_shutdown = true; wakeup(&bd_request);