From nobody Thu Jan 27 00:12:24 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 53BC0196B581; Thu, 27 Jan 2022 00:12:25 +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 4JkgyJ6Bt4z4bCb; Thu, 27 Jan 2022 00:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242345; 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=Eg+wJyL4Iwe0pkLsmi3oGBnIXiRYpvF6MxVdLc/VcQY=; b=BqS0Qt5TH69bJUJrTrPssrVk3J7x4JX6Av+MN/wppgJ984dUrO8jcylnnjWm9M6DJE0FUw 2C8UCv1Xly22DTuG2tq1QkT7XsrTcyeXD4g2uYLO9zFMUMmg1ARC3LPC6H3zAUyOKCpwal OQDNq6SFloGsJmr5kG+B2zj9evl6/nzYZD9aM8WH/sSoo8blJ4jfz+MgdEXeDXjDKOCMMq +LF+qEglwjfEJEDQqNpfKcM5B0Ne48XjxHL/zTSc1l4cRZR8iukLBB/XmTCINJtFuyXORj SRxeb3zon5ivOTbHfB1zEhZxo9JXzuELgy+paV5PSDbm6TiiVyo4sTl6Q/dlhg== 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 7AA4B4722; Thu, 27 Jan 2022 00:12:24 +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 20R0COaF002579; Thu, 27 Jan 2022 00:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20R0COnG002578; Thu, 27 Jan 2022 00:12:24 GMT (envelope-from git) Date: Thu, 27 Jan 2022 00:12:24 GMT Message-Id: <202201270012.20R0COnG002578@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: ade1367ba8e4 - main - fdescfs: 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: ade1367ba8e49db5417889cbd8de15e5e05d0ac8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242345; 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=Eg+wJyL4Iwe0pkLsmi3oGBnIXiRYpvF6MxVdLc/VcQY=; b=XMyje9OsWwWg9afqJ3gYnXL+Tz6rLDJyCXdC4Ei9KU/UHdOwZm9B0rKFeQSB62LA0mSB1q 4BLOnQil4QNiTBrVmINPTBsaI8lvJemqIIu7g4mHvGGBJiBWzE4dnQqkmkOi16WVaPtcb5 EmdgG4bCyv4VPEFbnWUJf9QpTsCPzkwji+NJ5fWKlGihyjqwOdshRLjHfr0Z5ciyEzges1 ufY9b9TqJDvGgXcAAdxIPDolfkUQqerETa3FghhRy9VPC5qFFwLMNpOdfWVToCylQBfYvy eHcXpMgqK1Ws09ja9eRRH3YnEWtJwkqPJ16ee6J3pMA89cXz6jNDizSAUBDR3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643242345; a=rsa-sha256; cv=none; b=GinRFm4/1bXYOi+KM4ntun1VR8owJnA6Nm/+NjWYNWi4fqApQ+mUbmxGa1EVP5bBUSGLEh Wxf9I9dkOpY9VJq9ZRTiQyyelLnJhcv03NWLaSJ3IKM4fp2nL7PAHHr9BdIVDR5rPjDQss oknfV+13JZ77AOQmdFMzr3QILqRVPy7UHhs01yQwgV6zqCm9o0tOZ6sb7eiOq3WLUv0mhp n6YI6Yog5B1lYgH7H4bt1IPvhxVhyp9se8E5s7S59JieDWEALgjgMe2y9+JxCbm0/2/ceJ 0y9lT4HB/Gqq9sJxnNuOMki9rz9O0yjAHGaFW4pDHQVy6GOvQ+wp8eREyTvahA== 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=ade1367ba8e49db5417889cbd8de15e5e05d0ac8 commit ade1367ba8e49db5417889cbd8de15e5e05d0ac8 Author: Mateusz Guzik AuthorDate: 2022-01-26 23:52:16 +0000 Commit: Mateusz Guzik CommitDate: 2022-01-26 23:54:38 +0000 fdescfs: stop using insmntque1 It adds nothing of value over insmntque. --- sys/fs/fdescfs/fdesc_vnops.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index d8dab3d7598c..0f6111586a38 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -93,7 +93,6 @@ static struct vop_vector fdesc_vnodeops = { }; VFS_VOP_VECTOR_REGISTER(fdesc_vnodeops); -static void fdesc_insmntque_dtr(struct vnode *, void *); static void fdesc_remove_entry(struct fdescnode *); /* @@ -120,17 +119,6 @@ fdesc_uninit(struct vfsconf *vfsp) return (0); } -/* - * If allocating vnode fails, call this. - */ -static void -fdesc_insmntque_dtr(struct vnode *vp, void *arg) -{ - - vgone(vp); - vput(vp); -} - /* * Remove an entry from the hash if it exists. */ @@ -203,8 +191,10 @@ loop: fd->fd_ix = ix; if (ftype == Fdesc && fmp->flags & FMNT_LINRDLNKF) vp->v_vflag |= VV_READLINK; - error = insmntque1(vp, mp, fdesc_insmntque_dtr, NULL); + error = insmntque(vp, mp); if (error != 0) { + vgone(vp); + vput(vp); *vpp = NULLVP; return (error); }