From nobody Sat Jul 13 03:40:04 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 4WLZ3S4CnTz5PDRv; Sat, 13 Jul 2024 03:40:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLZ3S3P7Fz4cCZ; Sat, 13 Jul 2024 03:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720842004; 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=5q36IyANHWUUSJgJjJH2YJjJ6EIjPueSwwN44SyFEow=; b=Sb4pqOxDWMAdudsJSMBoxhB9OCpSk2WXiTHGN/NFJIcFiBOwgWm2S0Epkqp+gvx/dSeGyR cDnOFVxYXFo3WTEMcOjVxfDhgvyhdpxchilJsyzn9lQIVI/Ylh/uHJKMxmsT/ru/jlBX86 Gl9mNm3v7w1R5Gqmv1vmzunC8clJ8XsZ7zfsH/eBjnGk2g4xwQqoU0b3L9f5opqb7JKbQk 09lwLtDUuJVSrEw/amkQ5QuedHRwYbeIr8OScVn+t5blJgfGVfHftR3Qj0skrQhVftjkzD v2N8MvL2LeDrvxdO9daRc0vCb2/Q7j5pWtGAYvmqlmZDtmXNu/XBfnEkHh2+hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720842004; a=rsa-sha256; cv=none; b=gwpEoUU38m6k+vJlS/UxcGac7qMDCuiDIi7nJlEzw6yBwaLruj/2cs9RmLfTQL9GZq40nO 2g2UQJsfVC7C4vOPeU2Qa7uRRc6dHupIMBG64c8By6l1YmCw/POPzZ4TwBJiINtQJlgWyt Fg63F//mdtQRovh7HZfYQYaVoYxr5kdODq4ygUQTftIV1rENmRk5IMSWBrhtt9RXMUw+q2 SQ4WV2HmaOul/4MOW4FrOklbuGaU3065SBFqN+wVrA48btp2kTYmgYik9GREIGORrd9Ncd yGkD3fV5orsFzhZ80KIiaygIFc7iK5PwiLgvZ7xaxlyZsJOyzaAV9WbWTfOBNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720842004; 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=5q36IyANHWUUSJgJjJH2YJjJ6EIjPueSwwN44SyFEow=; b=UgXaDMgz7gXm7++G8QEM4owwILGKrjaD+5L2OV71NkWlQ9paW5dBHghXJXSYNom5247WLK LY+X39A3DFjlsAUoQQx3iePd9u9hOWLPPfqPz5N7mO7F5b1Fy4jNgewwZKIHbDfs/cYy+m mVlDZKptIzc4C5xQqW8Qd6jBO8QCtytCBaUD2f5PJ1IiBDhcTkF5SKPrNiIqmWt7M4XOnJ /DOkq+fdOTnuVs0+JuPcDxA+t4dWrOE3duMMhv5rQl+49e1ZFsYkCqMBLF3DEADc2fD8vY kuMlvTAqe80T7wP0Vn2tgya8tviSM7EMi/ZZjBBnYgBqKJ4RjnAu8EhsY17AYw== 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 4WLZ3S310qz18fv; Sat, 13 Jul 2024 03:40:04 +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 46D3e4De045924; Sat, 13 Jul 2024 03:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46D3e4xS045919; Sat, 13 Jul 2024 03:40:04 GMT (envelope-from git) Date: Sat, 13 Jul 2024 03:40:04 GMT Message-Id: <202407130340.46D3e4xS045919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a6ca6dfd60b6 - main - p9fs: remove duplicated code 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6ca6dfd60b66eec563bd473d96b31f0be1de80a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ca6dfd60b66eec563bd473d96b31f0be1de80a commit a6ca6dfd60b66eec563bd473d96b31f0be1de80a Author: Danilo Egea Gondolfo AuthorDate: 2024-07-09 19:07:18 +0000 Commit: Warner Losh CommitDate: 2024-07-13 03:40:09 +0000 p9fs: remove duplicated code This code is using the vnode after it has been released and causing a panic when a p9fs shared volume is unmounted. In fact, it seems like it's just duplicated code left behind from a bad merge. PR: 279887 Reported by: Michael Dexter Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1323 --- sys/fs/p9fs/p9fs_vnops.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 5556e60f4bae..6ac0a7c008cc 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -125,16 +125,6 @@ p9fs_cleanup(struct p9fs_node *np) /* Destroy the vm object and flush associated pages. */ vnode_destroy_vobject(vp); - /* Remove the vnode from hash list if vnode is not already deleted */ - if ((np->flags & P9FS_NODE_DELETED) == 0) - vfs_hash_remove(vp); - - /* Invalidate all entries to a particular vnode. */ - cache_purge(vp); - - /* Destroy the vm object and flush associated pages. */ - vnode_destroy_vobject(vp); - /* Remove all the FID */ p9fs_fid_remove_all(np, FALSE);