From nobody Wed Mar 01 15:16:26 2023 X-Original-To: dev-commits-src-main@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 4PRd9l1DXDz3tysD; Wed, 1 Mar 2023 15:16:27 +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 4PRd9l0l2xz3PJh; Wed, 1 Mar 2023 15:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677683787; 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=d/I/1hIHj0/ZM6IYwjSjcDpkeNNpPzc94AJIo4Ul7b4=; b=ifX/xM2dSAv7bgOdaSMGvH3XpxRg0mN9GmTq0M/lKfQb71dxFX5zD8L7yZ61mBEL+2wQLr 3KPkOvtSlHHLGULc9fVNryrXHgLvPcsCkYtgbdZdrst3XL0SvSNREzFW8jHj1mYDmPm0or B9osz2httKbzVZjuiYoHL4SMenWx5MD6QGoO2LMsxdhiOR8L42jR/bIvBrcHZ0RgJURybM lqJqbdzYhvyJeU7PA/wwA6eHQMfq90HpiHkPtXffgXaWblzPqE3tgjvTvVBmTXSiyxN5ix r2itjkSNxAO7LdB6wLu2KwmAEZ+oqjBUDofYs90AWgs1tAGvamx77Easdld7Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677683787; 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=d/I/1hIHj0/ZM6IYwjSjcDpkeNNpPzc94AJIo4Ul7b4=; b=nm4xqjuBMqIaB7ZKRuEFagoVxYPnRs7uBjzQjUq4F1kS215DehzFdOXmj6a1rvKBmO6zd+ +GKffNK7i35PHQz7zjH2uc+/ors/BvriHkMorOd3xTMaagAVQ3WKCDtbUnM5Kpa6Vn/yL9 qQzSnh48OJR/pogWDxJogem6bQxHIX4V4MIbEt3r+89b08DnMLTjUUWJzxWPr936bdTSAx QfzR5/L8qRHgIhRqY0OnCvzceQL1+fTnRnyzBQAVWzhJ128ig2K2QD61mhjs9HK8/j20ZT fGLgVRJtdam6eBwPDVOjIoIJkMqde72GZhPB9vpdpiuuV8Mr/wfBSPALUOhE6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677683787; a=rsa-sha256; cv=none; b=Uxn/O1D67uknObmEdwLrr8haRJUscEu82xcnbmNqB4lfsjDPpkVsU4Z7FlE5maNCwks/PM 3lQtV8+VnLPEpP58FJnpDMef+HMLBS5OgMl6exaZEO8+5SXBjkZwPC2e9wW7vHuTYqQZgx hUmb4W/naUEXnTie9GnzxszZg5hRZbJIwbTZ7hXhSOxEmGLS2S05w6jlF1Yb2vbiEqB5jO DuLnmiDnMhN3e1Z7OyZp3a1zj2z8+xtQAHKujs0yvww1AdQ+jIeq6gJtu/7jqdu6rSpRzm uW7OTEacvEL3laX1H1TK/P7frQozsPHL1NYc7VDC56lR1t325K1Ov0h/PZ2Xzw== 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 4PRd9k6vZ5zdqg; Wed, 1 Mar 2023 15:16:26 +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 321FGQbc070300; Wed, 1 Mar 2023 15:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321FGQe0070299; Wed, 1 Mar 2023 15:16:26 GMT (envelope-from git) Date: Wed, 1 Mar 2023 15:16:26 GMT Message-Id: <202303011516.321FGQe0070299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bcd8cd859e69 - main - buf: Make buf_daemon_shutdown() a no-op after a panic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4 commit bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4 Author: Mark Johnston AuthorDate: 2023-03-01 15:07:56 +0000 Commit: Mark Johnston CommitDate: 2023-03-01 15:15:54 +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 --- 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 b40ee382c42a..f1089964a041 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3419,6 +3419,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);