From owner-dev-commits-src-branches@freebsd.org Wed Feb 24 07:58:48 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@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 ADDB655397D;
Wed, 24 Feb 2021 07:58:48 +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 4DlpFz3kG3z4ZGP;
Wed, 24 Feb 2021 07:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 3521D28B56;
Wed, 24 Feb 2021 07:58:46 +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 11O7wkW6046482;
Wed, 24 Feb 2021 07:58:46 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11O7wkXn046481;
Wed, 24 Feb 2021 07:58:46 GMT (envelope-from git)
Date: Wed, 24 Feb 2021 07:58:46 GMT
Message-Id: <202102240758.11O7wkXn046481@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: e45f7c841983 - stable/13 - nullfs: provide special bypass for
VOP_VPUT_PAIR
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e45f7c841983f6ccd65d6061a5542989a8201826
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2021 07:58:48 -0000
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=e45f7c841983f6ccd65d6061a5542989a8201826
commit e45f7c841983f6ccd65d6061a5542989a8201826
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-01-24 13:22:48 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-02-24 07:43:22 +0000
nullfs: provide special bypass for VOP_VPUT_PAIR
(cherry picked from commit e4aaf35ab54958f74409790fa2b7df8c2d230cee)
---
sys/fs/nullfs/null_vnops.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 1de0cdfca9ac..45065e0be7b5 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -967,6 +967,54 @@ null_read_pgcache(struct vop_read_pgcache_args *ap)
return (error);
}
+/*
+ * Avoid standard bypass, since lower dvp and vp could be no longer
+ * valid after vput().
+ */
+static int
+null_vput_pair(struct vop_vput_pair_args *ap)
+{
+ struct mount *mp;
+ struct vnode *dvp, *ldvp, *lvp, *vp, *vp1, **vpp;
+ int error, res;
+
+ dvp = ap->a_dvp;
+ ldvp = NULLVPTOLOWERVP(dvp);
+ vref(ldvp);
+
+ vpp = ap->a_vpp;
+ vp = NULL;
+ lvp = NULL;
+ if (vpp != NULL) {
+ vp = *vpp;
+ if (vp != NULL) {
+ vhold(vp);
+ mp = vp->v_mount;
+ lvp = NULLVPTOLOWERVP(vp);
+ if (ap->a_unlock_vp)
+ vref(lvp);
+ }
+ }
+
+ res = VOP_VPUT_PAIR(ldvp, &lvp, ap->a_unlock_vp);
+
+ /* lvp might have been unlocked and vp reclaimed */
+ if (vp != NULL) {
+ if (!ap->a_unlock_vp && vp->v_vnlock != lvp->v_vnlock) {
+ error = null_nodeget(mp, lvp, &vp1);
+ if (error == 0) {
+ vput(vp);
+ *vpp = vp1;
+ }
+ }
+ if (ap->a_unlock_vp)
+ vrele(vp);
+ vdrop(vp);
+ }
+ vrele(dvp);
+ return (res);
+}
+
/*
* Global vfs data structures
*/
@@ -997,5 +1045,6 @@ struct vop_vector null_vnodeops = {
.vop_vptocnp = null_vptocnp,
.vop_vptofh = null_vptofh,
.vop_add_writecount = null_add_writecount,
+ .vop_vput_pair = null_vput_pair,
};
VFS_VOP_VECTOR_REGISTER(null_vnodeops);