From nobody Sat Nov 2 13:54:56 2024 X-Original-To: dev-commits-src-all@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 4XgfPF2lt0z5c448; Sat, 02 Nov 2024 13:54:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XgfPF0TbJz40Qv; Sat, 2 Nov 2024 13:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730555697; 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=YMoXROx0Xxvm9RBvHUg+7pOOcC2pNDmQM3FPAF7JcXU=; b=BOUHLxu0YNEPGRUzdBPn2yd4EOTc7SuwrbScpC3FnZyd+qRAq5wBEtPKx+ZSQPqcKOYoYD vBRSNvrR1N77bkbR/LBech4fa49OO2NSFsvMX7JZDadxGnJNX39P13oKmCDDze/8Y8+gRy r0tZRjpWABO9Ye1sjf5W+VaalC9qqKxfS8m/WJ0RJ6kPopBYzG58+yvkwC6WNiPYAZzQSa rYC/U8BZ9Sd1i/HZP0+MfrKZPPpNDRCRxcZZSiHg3boK9IEJ6LhsN9CdjPcub7wbxZL/a8 UbtX+waOpXgNZnEpK28cBtmwXcrFDXbqM08VTTmmCyN/ekSeutMl2/eSUys/RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730555697; 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=YMoXROx0Xxvm9RBvHUg+7pOOcC2pNDmQM3FPAF7JcXU=; b=uVZx/qsvQc2O2WJ7yMlH3A5PxtFAS4iNQoH4WOomcUwsC15W2pUkRrl7ojD6yKMapdWRW0 JPvJfeh21a/G8JjPpTiVGX3HSChqX6m4MW+YccPV1Iibw0AVVIYbQhfImC3Jn3062P1qYd f043hBqPLyihx19SJ4usuFZ+UkOZ6TubsQJDjPsbC1LXtKr2FeewZCGRB0zX5CUPZ+TfxR anfqo7LORH2QPoHgVijQgylM42/145CbrqCDN9m0mX/VLGeeKVR/W7E5yFoKNAscbKQrtk vXDeGb30LlaMvV7KiLSPDiXpcF2xZKXUO3pSnqgsa7sbTa8rKZ10OJSEzmLGQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730555697; a=rsa-sha256; cv=none; b=on3++h5xPMWdf1TMYf9v+TOnmtIeMH9gpbtR6N2M5NZHruoWVBHo80Lh4q/t44nd3k4m14 a7Qshx/4NAM3i44gu6oWP9HcDB0n8dI69NW65AQkB1P9hOyD4VyCVCZwkzVcB99Xa28jq5 gDhlmQUxuabzV+89CD/zeN6VznfNzEJuksjyqy9RDEHYZL0RIqIcMr3WiTJaAeZySY4yMP qNmPa49iWV6p6u92NQ6n21sYEhjT7wsQHJ7MExHrisEFT1ovuyM0w98l8AEJ20lo21a6Mq Xgt5qdrMMOzynAIuRT90hS4yOr69SqFl3aM4xPsKx2vdoVhdaLFPUuvgDBD2Mg== 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 4XgfPD66TWz16qB; Sat, 2 Nov 2024 13:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A2DsuZ8099006; Sat, 2 Nov 2024 13:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2DsuuG099002; Sat, 2 Nov 2024 13:54:56 GMT (envelope-from git) Date: Sat, 2 Nov 2024 13:54:56 GMT Message-Id: <202411021354.4A2DsuuG099002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a6ec2147418c - main - nvmf: Deregister the post_sync eventhandler correctly during detach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6ec2147418c29b259ff6b4f4274417b55419285 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ec2147418c29b259ff6b4f4274417b55419285 commit a6ec2147418c29b259ff6b4f4274417b55419285 Author: John Baldwin AuthorDate: 2024-11-02 13:54:36 +0000 Commit: John Baldwin CommitDate: 2024-11-02 13:54:36 +0000 nvmf: Deregister the post_sync eventhandler correctly during detach Previously the handler was removed from the wrong eventhandler list. Fixes: f46d4971b5af nvmf: Handle shutdowns more gracefully Sponsored by: Chelsio Communications --- sys/dev/nvmf/host/nvmf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvmf/host/nvmf.c b/sys/dev/nvmf/host/nvmf.c index 9d06b501d675..2c438db2eb23 100644 --- a/sys/dev/nvmf/host/nvmf.c +++ b/sys/dev/nvmf/host/nvmf.c @@ -780,7 +780,7 @@ nvmf_detach(device_t dev) sx_xunlock(&sc->connection_lock); EVENTHANDLER_DEREGISTER(shutdown_pre_sync, sc->shutdown_pre_sync_eh); - EVENTHANDLER_DEREGISTER(shutdown_pre_sync, sc->shutdown_post_sync_eh); + EVENTHANDLER_DEREGISTER(shutdown_post_sync, sc->shutdown_post_sync_eh); nvmf_destroy_sim(sc); for (i = 0; i < sc->cdata->nn; i++) {