From owner-svn-src-all@freebsd.org Wed Aug 21 23:24:40 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id E11C9D745F;
Wed, 21 Aug 2019 23:24:40 +0000 (UTC) (envelope-from mjg@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)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 46DNzX5fLhz3DWX;
Wed, 21 Aug 2019 23:24:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B89BD231CD;
Wed, 21 Aug 2019 23:24:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7LNOeVU046595;
Wed, 21 Aug 2019 23:24:40 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7LNOeTj046593;
Wed, 21 Aug 2019 23:24:40 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201908212324.x7LNOeTj046593@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Wed, 21 Aug 2019 23:24:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r351360 - head/sys/fs/nullfs
X-SVN-Group: head
X-SVN-Commit-Author: mjg
X-SVN-Commit-Paths: head/sys/fs/nullfs
X-SVN-Commit-Revision: 351360
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Aug 2019 23:24:40 -0000
Author: mjg
Date: Wed Aug 21 23:24:40 2019
New Revision: 351360
URL: https://svnweb.freebsd.org/changeset/base/351360
Log:
nullfs: lock the vnode with LK_SHARED in null_vptocnp
null_nodeget which follows almost always finds the target vnode in the hash,
avoiding insmntque1 altogether. Should it be needed, it already checks if the
lock needs to be upgraded.
Reviewed by: kib
Tested by: pho
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D20244
Modified:
head/sys/fs/nullfs/null_subr.c
head/sys/fs/nullfs/null_vnops.c
Modified: head/sys/fs/nullfs/null_subr.c
==============================================================================
--- head/sys/fs/nullfs/null_subr.c Wed Aug 21 23:13:00 2019 (r351359)
+++ head/sys/fs/nullfs/null_subr.c Wed Aug 21 23:24:40 2019 (r351360)
@@ -222,9 +222,6 @@ null_nodeget(mp, lowervp, vpp)
* provide ready to use vnode.
*/
if (VOP_ISLOCKED(lowervp) != LK_EXCLUSIVE) {
- KASSERT((MOUNTTONULLMOUNT(mp)->nullm_flags & NULLM_CACHE) != 0,
- ("lowervp %p is not excl locked and cache is disabled",
- lowervp));
vn_lock(lowervp, LK_UPGRADE | LK_RETRY);
if ((lowervp->v_iflag & VI_DOOMED) != 0) {
vput(lowervp);
Modified: head/sys/fs/nullfs/null_vnops.c
==============================================================================
--- head/sys/fs/nullfs/null_vnops.c Wed Aug 21 23:13:00 2019 (r351359)
+++ head/sys/fs/nullfs/null_vnops.c Wed Aug 21 23:24:40 2019 (r351360)
@@ -893,11 +893,7 @@ null_vptocnp(struct vop_vptocnp_args *ap)
return (ENOENT);
}
- /*
- * Exclusive lock is required by insmntque1 call in
- * null_nodeget()
- */
- error = vn_lock(ldvp, LK_EXCLUSIVE);
+ error = vn_lock(ldvp, LK_SHARED);
if (error != 0) {
vrele(ldvp);
vn_lock(vp, locked | LK_RETRY);