From nobody Thu Jan 27 00:12:25 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 AE0F6196B628; Thu, 27 Jan 2022 00:12:27 +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 4JkgyL25lNz4b9C; Thu, 27 Jan 2022 00:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242347; 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=imOK6UigOT0iFEl6eamkOTiLLgxLI4i9r+luH+08SYA=; b=fAGpIkyBF+euYP8MBgodpsl37YlnyRkvJ3d6w0e42sA/WFAGuaghshsD1r27s+BDpqKxIq AOJ5rP1RUHtq4ROME5HG3xEyAPK5mEH9kfWhg1mECnP6qnAWb+5+5UlYGdkR4DMIAlri5S CwS9ioxSy/cMz+J5e1qTk2narZZSXpd3pwewHFs5P26lz4HwmD4yIeRdPUSR9f7BYo7Xqz gMlQVTFr9QwWkmDHg1lE6hpGv5r8KB3hDa0GMTUyE+2RHXW6uNYQZlRankICy//OKqi8l2 4oWpsHAXYktnae6CtHYoRqKL1hbUshDF4GVih+TnBVGe1GyN+5KoIRO1cAmAcw== 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 928BE47AA; Thu, 27 Jan 2022 00:12:25 +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 20R0CPXY002603; Thu, 27 Jan 2022 00:12:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20R0CP0P002602; Thu, 27 Jan 2022 00:12:25 GMT (envelope-from git) Date: Thu, 27 Jan 2022 00:12:25 GMT Message-Id: <202201270012.20R0CP0P002602@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: 4e91a0b9fece - main - nullfs: 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: 4e91a0b9fece53711d5ff8fbc56762bd6d5fee4f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643242347; 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=imOK6UigOT0iFEl6eamkOTiLLgxLI4i9r+luH+08SYA=; b=i9WxpgniGTbOTkyCQiEIAQTt2KD4WfsuyjGQf3OemeZi4tDb3Ev2ncGvhWekABecqKfBcX i1jxixoNYPiB37Lv5YL/FQszxx03yrzcbD4IIAue6s7hQTyx24jB7WNdRHn/H8y3kmq5Et z1ugy6RP8KXb6HaUIFbhswLB2xLT+9dsodSynPKVWf2A8To8m6v+AO/1ePV6U8AhPJxeIH 70nL9T2yQuPccyUQO5wQVYY4IAk5NEOsMN2ss8zhXCZ4NGaBoVAg2J4WcSep5V5nyCdrgf 0vAQRSAnlG/08QNQuBTB/iFZyYPZ+BhLQ28Q1VmK6t3YlEoC6nlupjal1Gquhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643242347; a=rsa-sha256; cv=none; b=KZ7BTPomYEjWqM9rJ28JMrk3XLb6PURKYJh/eMCq6tVrriQ3a2ZnM8Pq359nHW8cg6HFBB z5TeldsyKbQa8TW7KgIit8KCbSF5DI+O4O9yVgQuW/5eU8n11hPMTtcRJ7qyUoUe/vwLCo WAzb8dnWCp6zagP8QYBTUG0+Z6fSPzuG1qHGvF3P8bYlCKjjNpGSx57kUr/AbusOcq0q3A uqFyctMov3B1vZFaYnN14lDMnETIZkqgYBEK8SayS+zSgQg5aICsIdDcC5U2JPCXk8a0eR te5Aex7j0GkvcPi/M7E1wU3QADumY9fkx02WX9W+dQXY2/jsjP1XOTUkiP2Y4g== 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=4e91a0b9fece53711d5ff8fbc56762bd6d5fee4f commit 4e91a0b9fece53711d5ff8fbc56762bd6d5fee4f Author: Mateusz Guzik AuthorDate: 2022-01-26 23:53:59 +0000 Commit: Mateusz Guzik CommitDate: 2022-01-26 23:54:47 +0000 nullfs: stop using insmntque1 It adds nothing of value over insmntque. --- sys/fs/nullfs/null_subr.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index fb6a13449df7..5f8cbfd4ce31 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -182,14 +182,6 @@ null_destroy_proto(struct vnode *vp, void *xp) free(xp, M_NULLFSNODE); } -static void -null_insmntque_dtr(struct vnode *vp, void *xp) -{ - - vput(((struct null_node *)xp)->null_lowervp); - null_destroy_proto(vp, xp); -} - /* * Make a new or get existing nullfs node. * Vp is the alias vnode, lowervp is the lower vnode. @@ -219,7 +211,7 @@ null_nodeget(mp, lowervp, vpp) } /* - * The insmntque1() call below requires the exclusive lock on + * The insmntque() call below requires the exclusive lock on * the nullfs vnode. Upgrade the lock now if hash failed to * provide ready to use vnode. */ @@ -252,9 +244,12 @@ null_nodeget(mp, lowervp, vpp) vp->v_type = lowervp->v_type; vp->v_data = xp; vp->v_vnlock = lowervp->v_vnlock; - error = insmntque1(vp, mp, null_insmntque_dtr, xp); - if (error != 0) + error = insmntque(vp, mp); + if (error != 0) { + vput(lowervp); + null_destroy_proto(vp, xp); return (error); + } if (lowervp == MOUNTTONULLMOUNT(mp)->nullm_lowerrootvp) vp->v_vflag |= VV_ROOT;