From nobody Mon May 20 00:25:33 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 4VjJHy0tkzz5LKFx; Mon, 20 May 2024 00:25:34 +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 4VjJHx2qxmz4mMX; Mon, 20 May 2024 00:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716164733; 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=EgW1LIukD3EYk0yugicYGQAAfvMnl0R/HUwdkDExWBk=; b=svFfxBxrFoQCT8LsRA2X7UQHzH8AXSQrl+H5i9Wl03bf4YwYcmn3PCLYoQZTHTJl91NbBh vD69/sroCIdda42zN6k2kEHtrtWizfclJ3eWs6FMKxorYJ6A/o6HLZ2iIrJ6RSIHGsoG2c HYXKaMQcYIGwkOnVugQB10mTFWlCiS74sT30x7iuQOZZlqnffFrTvUY6v3r6St09BLYRMp p/wY6f09opFVzaiCZN/aKnY9KdQtkFUC+LqSDVOELALxkCI31xeu17ovs7jtktbAsAYten RdbYMvFyYOouB1AxFImRaAy0iXwR/u8EgyDTUn3LVQZOTVFrc6mnIx7XdrGh6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716164733; a=rsa-sha256; cv=none; b=xnfRR9w+T0z8v3GEUOKj196vb/pjsasHWyEMvVNEpNqpHcDwDfi+Wj2KMAO4ISRf3gSAxT lMVjVpKpxxbUoEBo8xsx8sJdHx1HQFiLxTLj4fs9NZzNEhmsN/NKZjfUYetTq5PgydG2fB fEblHFwUE4G38JZ2NmYyWyDj/8ZbI6fxsJ9oUlxYndeVVP9yFsQn/7BWQHLRP0XcTflXjr Z1N/HzzkC/rR6NPsF0MWVzTSmkay3OI36jVkRcRoyLNelJRSfIoKm3hxbG4yaHDEHyyspZ YEQg5+mi81WCO42WmAoZysg+mHHkksv5274wJMjuxGv33EIJFKy4ASEVlHupMw== 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=1716164733; 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=EgW1LIukD3EYk0yugicYGQAAfvMnl0R/HUwdkDExWBk=; b=eX7WAMp3CzZSKWOn+qV12lix/I6r+JX102G6t2pA+cTmC8NGNKDq/603YqAFsUJ+jYMCU3 8iU3fgxC/iFh4XSRg7Zpzp6ELbysH8pTTcbuKhSiwKxyGd8xdKNUM4Qrd1HQOqzYsY32re ebw+MgzjjxSheLBo9Q7s5mDK1xauDSJVnPGjaEg8IfXPlBW52v46LFc9uuK0812Lln83MI bb14T149VrrsG+LN8u7jWjpCGiB3saib/af32TA2oN3AzrqqPzK+zNXeb1tNulya55O2Mp 3F23eZjrcJ/Y4u6ZUnpoMtN2Ko3fwCUd0UlPGVWIztbQN+RdxT9w8Qmu8qHwWw== 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 4VjJHx24ByzGjY; Mon, 20 May 2024 00:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44K0PXYg008425; Mon, 20 May 2024 00:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44K0PXiZ008422; Mon, 20 May 2024 00:25:33 GMT (envelope-from git) Date: Mon, 20 May 2024 00:25:33 GMT Message-Id: <202405200025.44K0PXiZ008422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ab135e19f70a - stable/14 - tmpfs_destroy_vobject(): clear v_object under the object lock 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab135e19f70a517c41de30e89f18441c0134af22 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ab135e19f70a517c41de30e89f18441c0134af22 commit ab135e19f70a517c41de30e89f18441c0134af22 Author: Konstantin Belousov AuthorDate: 2024-05-12 01:26:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:57:54 +0000 tmpfs_destroy_vobject(): clear v_object under the object lock (cherry picked from commit 46811949797b7e44521cd56cfa61b6c8378c4600) --- sys/fs/tmpfs/tmpfs_subr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index b12e9b91fabc..de2c342e41c4 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -116,7 +116,7 @@ tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old, /* * Forced unmount? */ - if (vp == NULL) { + if (vp == NULL || vp->v_object == NULL) { KASSERT((object->flags & OBJ_TMPFS_VREF) == 0, ("object %p with OBJ_TMPFS_VREF but without vnode", object)); @@ -916,6 +916,8 @@ tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) VM_OBJECT_WLOCK(obj); VI_LOCK(vp); + vp->v_object = NULL; + /* * May be going through forced unmount. */