From nobody Thu Jan 27 00:12:23 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 CE3B4196AFBA; Thu, 27 Jan 2022 00:12:23 +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 4JkgyH3gNnz4b97; Thu, 27 Jan 2022 00:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242343; 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=cNYhEdinP/mCiL3ApuHb+kIH5o5MjWn6yP5rnG5adiY=; b=uhRDVfTu/REGNeXI1q8vUxnj66kFjLfFH3CMOcWo1yI1i0z+4ORxFmLEgkHsUVCBv0Gvh8 hihXW8aCaUyYabkKVYcgF1nn8deiEq2v84XkhBvw9FCvjFfLZDjLpA4NvWMEvhbkN2GfT1 Uo9K3lUmqW6CIanWp/knsFnGTW43lUphvGaQGrlJ/u3p/yWzF2ANWnGfQRVvXD7ZQvwFej thTfHRM2E0K8+2FE15yM/Y6ZwEUJDReHHEDnJ3wuhekPg+xnbAbXQBrQEnoNql8C2YrVAf VE5U8HN6h6cgzLe2tlVgOnqKgHiWO1Nw4aazsyaeaMNCd798LabRN5AesoWVug== 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 5EF534721; Thu, 27 Jan 2022 00:12:23 +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 20R0CNeq002555; Thu, 27 Jan 2022 00:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20R0CNqq002554; Thu, 27 Jan 2022 00:12:23 GMT (envelope-from git) Date: Thu, 27 Jan 2022 00:12:23 GMT Message-Id: <202201270012.20R0CNqq002554@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: 3af3e99ce4a2 - main - devfs: 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: 3af3e99ce4a24c5d7ffbdaf12b22e91257dc198d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242343; 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=cNYhEdinP/mCiL3ApuHb+kIH5o5MjWn6yP5rnG5adiY=; b=GfBLbPuPde9TYz7Wj3Ev3cCXL2MZmiAfxvGsUBNFIrJFMCXIYX5x0gVuM6WQRDdZSTCE6i Lmu/e1j++7sckSBQo2W2Jknu7ys8gE/BOfcin792anA6pyNDzRILwYFs7p0pR/wZM5KzHS Z3eDmYzd2hctEmVOjmiXHhE2rf0exNOr11qP/xOmVk7fygWzhedFHqQ370227fL8KtNX6F TjbXLGDtwp7WPtPFLCX7gMsm4ZeAimEeWmDgt4ev0CmPGiYEq+6iLx6kUdYal5DJaIUPaf SdqM6Hnfi3J/Y+lInMDvmMAsIseZqKI7nrh9brzLb0H8SjZ7VxRKa2P5g2XW8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643242343; a=rsa-sha256; cv=none; b=FAPEdaDM4hbOC5qtqcZETTRowKc+qkx+cvUVdfdFGJBc3o9M/IhU7dnEExbtGENfkK2MUo TUoBgFz0ngiHzx8Po/34yE6WVdTyM0orQsqAxmLwywX0KH8Q5T3Yip+lYVN4CXKOEkx6/3 FD8350/iwkXSoxrxyPNqwu2Ngm0nPxIBGTP5LzK3LaQrBwqbBVsZdWNigpXxddOdN0zSqU hvgUi0ylZmQY8zKN8EG93QJ5FDgYLG+1u1Oxk7M0jjOfhWpw5TCt032T5hIJg3FhbnL3Cc tyRlEZ16/7w+Hmzx+w/D721GlFnCD5cXQa3UO+Ue3fUgwB0JV9R6wdkTnmt2uA== 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=3af3e99ce4a24c5d7ffbdaf12b22e91257dc198d commit 3af3e99ce4a24c5d7ffbdaf12b22e91257dc198d Author: Mateusz Guzik AuthorDate: 2022-01-26 23:51:41 +0000 Commit: Mateusz Guzik CommitDate: 2022-01-26 23:54:30 +0000 devfs: stop using insmntque1 It adds nothing of value over insmntque. --- sys/fs/devfs/devfs_vnops.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 594dc087aab3..dae4079c2c6c 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -508,11 +508,9 @@ devfs_allocv_drop_refs(int drop_dm_lock, struct devfs_mount *dmp, } static void -devfs_insmntque_dtr(struct vnode *vp, void *arg) +devfs_insmntque_dtr(struct vnode *vp, struct devfs_dirent *de) { - struct devfs_dirent *de; - de = (struct devfs_dirent *)arg; mtx_lock(&devfs_de_interlock); vp->v_data = NULL; de->de_vnode = NULL; @@ -617,8 +615,9 @@ loop: vp->v_data = de; de->de_vnode = vp; mtx_unlock(&devfs_de_interlock); - error = insmntque1(vp, mp, devfs_insmntque_dtr, de); + error = insmntque(vp, mp); if (error != 0) { + devfs_insmntque_dtr(vp, de); (void) devfs_allocv_drop_refs(1, dmp, de); return (error); } @@ -681,7 +680,7 @@ devfs_close(struct vop_close_args *ap) /* * XXX: Don't call d_close() if we were called because of - * XXX: insmntque1() failure. + * XXX: insmntque() failure. */ if (vp->v_data == NULL) return (0);