From nobody Thu Jan 27 00:12:26 2022 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 E1626196B56F; Thu, 27 Jan 2022 00:12:29 +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 4JkgyN4SkMz4bFX; Thu, 27 Jan 2022 00:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242349; 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=xFsG4Cka6FnNWi1jteGL7JQtXs08SbqD1M8aeb+aau0=; b=NSpB40zqBDk8XJ1nm6AvhdHOVKdfuxdOqsXIyO+j5O6WtD0+T2kjBc5WplKvLRuNc/RWM2 aTpK+DERBeskdduMJIxCKb6Nqr1S6IDHAxDT39lYppyKXDyIvnCVwEDtK0H1V1/t/FatTs XdTfpvmVgq/R5mRJjh7RHfSaFRkhXiycrOp+0A6osD4UR36AnPy3AAOFXswF/8yd8k3nJp C1ZFzOsGiJegVwvpyKdGZA3zM2JMx7+BlPlH+3yYihn12wyy9iMH/U7BjFzUdzYiV7kVTK q/E8lD9MdSlZbRzIOnUKB01EB/6WrWPUNFBJ246tDrFyJiNhZ1XOne8j4Fpn1g== 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 B55AA4985; Thu, 27 Jan 2022 00:12: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 20R0CQNV002627; Thu, 27 Jan 2022 00:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20R0CQWW002626; Thu, 27 Jan 2022 00:12:26 GMT (envelope-from git) Date: Thu, 27 Jan 2022 00:12:26 GMT Message-Id: <202201270012.20R0CQWW002626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5ccdfdabc813 - main - tmpfs: stop using insmntque1 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ccdfdabc813d9f97df54c3d5de6951c9ec5ff98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242349; 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=xFsG4Cka6FnNWi1jteGL7JQtXs08SbqD1M8aeb+aau0=; b=uF4DyEZWUXLcUgbhmRQI1vRKuoDun6RugDrpfLsgxJxVZFKeabKq/2+5DF0eTrBUEUYnGD OLYOFl8NnMgQzzLwd1LmiUc7WEz0MM9uVMGE0ZVcHIdyqcMQC7njgPKTacCixF+WcKANZC wkvEB60xwRE8tqV2tI8c47f5+1c0Q0TM6RVU6Exi4mZHgL/7EJrG/N1FfEN0N+9Df1HNYL RRx/1bRxUBbUlDQ4U6l7jcdIb4xu7HT0qTnI7SvwZTx8uTAf/ZdAOXS3NgSi1dFgIF2Ftp NCBaf9Mv/WLVHs6ULoJUN2qMl3UTnTXdhRf3PUOqGqlvifaLdUaGh0q/HNFedQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643242349; a=rsa-sha256; cv=none; b=PkQUqQxVas3poL22QzX+lhxod0zsrCdcykXv+vEgX25yYWG2MdpoADz1vXRIwLYBi8zPSo ANHC80vBMQqapi0bgsX9ZnlpWuv8Sd4tf0joTM9+B8i42WH7RJSLNrvVJiBPOdPBZPwTt5 XZa3jOmSNMr24K9lh4N7Bjy8Z0FshcgZ1JELAk+LXMpVXewqEC3f9jf1Nifa5ODcjw+Y6Z wMO23dl7v3khQ1m63zbewCr3zWaneIzZH+jCp98obi6aUt8eXS3EnGzOPrYdHQD5iYsN6Y 5+BjrnWaOK2H24Aon1XEyxG7W8i3BwOdpiKaVYojhfz6SkX+k3pM7R2ovKChCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5ccdfdabc813d9f97df54c3d5de6951c9ec5ff98 commit 5ccdfdabc813d9f97df54c3d5de6951c9ec5ff98 Author: Mateusz Guzik AuthorDate: 2022-01-26 23:56:12 +0000 Commit: Mateusz Guzik CommitDate: 2022-01-26 23:56:12 +0000 tmpfs: stop using insmntque1 It adds nothing of value over insmntque. --- sys/fs/tmpfs/tmpfs_subr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index ca530fd72fdb..234984b47c59 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -826,7 +826,7 @@ tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) * Need to clear v_object for insmntque failure. */ static void -tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg) +tmpfs_insmntque_dtr(struct vnode *vp) { tmpfs_destroy_vobject(vp, vp->v_object); @@ -983,9 +983,11 @@ loop: if (vp->v_type != VFIFO) VN_LOCK_ASHARE(vp); - error = insmntque1(vp, mp, tmpfs_insmntque_dtr, NULL); - if (error != 0) + error = insmntque(vp, mp); + if (error != 0) { + tmpfs_insmntque_dtr(vp); vp = NULL; + } unlock: TMPFS_NODE_LOCK(node);