From nobody Mon May 20 00:26:05 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 4VjJJZ2BcZz5LKQX; Mon, 20 May 2024 00:26:06 +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 4VjJJY61KRz4n5F; Mon, 20 May 2024 00:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716164765; 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=sfdlGrTr5Mlvv1NjRtRuvleTg5QWwmrIao9gktDRxVo=; b=vp+0Y8ABqqq0UQ4NGx5hOIawc3NxDDrSbTkiyyFz7wgcG+trj+XZHPV2FnJ7e6QAN+VpPu 53TURfoV5amozdZscUY//RZfSiUTsL3//hAeIc+HU1mnCBup1W7D2vtRJkzRdbIDxcJYm6 s4vjKkSxw7PUwfbvkIawKvuZZ93a8JPKfcH6Oq/joNrib59mAy0ezy2J4/A8/olWUoKiPu yn4rUIlE/xrsYMxmj+VnjHBhYBnm/VvwEVv5Bs4ZERJO7w6Wr1F72uWQ7zSoaDkyyuAyGN 9shr7p0GfONPBS3VXap5K8z2XVz6Sk56QWdedszAKpLnjfhfnPkYPtmQi5orlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716164765; a=rsa-sha256; cv=none; b=q6F/lVZlApVwwvF8ID7gyBy1Qc7PQjVnOzdwpgLgPylSdu+Y5BPahHHr8veNs8oGQ8QixK rrsuk/x1NK+YnBQcTBNMX5ZCtkCMCsCUT1UMwPhTbgZaopjs4nVlbxzCuwwMDLKMypQ+pG FMl3+yV8NVPDrwOl0rwpU218WD9CXdJHB4BsTG4rzQlSAht29/b//Udd7drwNVpQz0lHyW stimcfAXzjfHEG7vA8/CCLRZz1rRhmlxibGiZzejHNfGjIaHlurH7cE/fJFK8iAYijZ4Os EwBdkfqqEyXMXuqK4d3iXz/+1wkgt1iWesu/+RowQVpgzekVKSxOhWVrcENebg== 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=1716164765; 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=sfdlGrTr5Mlvv1NjRtRuvleTg5QWwmrIao9gktDRxVo=; b=tRPYmWO4czdrabN2Z32Lq+yzoZOWBt6xN3mcxRdGtjznRZvB19p6l7IWfRhN+o7qcOUiOk oTXna0gGrBn3/PnD6V+ieE0Y+qZIU4iOztGDjIzD0z3sLLxY+sRm8Jo2AJ6XRCNeI1+mMt /gIrfzrtEgVgBXI24FFg4YVzq7RMF5g0LTyDoTW6A0OWzk/sNj6bs28MEPrnjIGxiU4zf1 YA6VfgeIJnkfSH5o97fUzuRCpAlZuE3/L+G1VQY4tTdajTZwpaRvjEo9e/LEp9edXtSJ2K NbeGjvg+CADRwBcy5g5MWbM/L0teck+yNbjiDbYsi1hkfx7CCHG2v1bwgJjZtw== 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 4VjJJY4JN2zGxg; Mon, 20 May 2024 00:26:05 +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 44K0Q5nA008758; Mon, 20 May 2024 00:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44K0Q5u4008755; Mon, 20 May 2024 00:26:05 GMT (envelope-from git) Date: Mon, 20 May 2024 00:26:05 GMT Message-Id: <202405200026.44K0Q5u4008755@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: e45c358ec663 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: e45c358ec6639209c748f6ad0dd2f89ebedfa91e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e45c358ec6639209c748f6ad0dd2f89ebedfa91e commit e45c358ec6639209c748f6ad0dd2f89ebedfa91e Author: Konstantin Belousov AuthorDate: 2024-05-12 01:26:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-19 00:59:13 +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 90fffb11e4c6..54d28edb10b5 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)); @@ -909,6 +909,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. */