From owner-svn-src-head@freebsd.org Sun Jan 19 05:36:46 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 69C8423334C;
Sun, 19 Jan 2020 05:36:46 +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 480k7f1yBDz3NSq;
Sun, 19 Jan 2020 05:36:46 +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 3E4686201;
Sun, 19 Jan 2020 05:36:46 +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 00J5ak3b090275;
Sun, 19 Jan 2020 05:36:46 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00J5akOr090274;
Sun, 19 Jan 2020 05:36:46 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <202001190536.00J5akOr090274@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: Sun, 19 Jan 2020 05:36:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r356879 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mjg
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 356879
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jan 2020 05:36:46 -0000
Author: mjg
Date: Sun Jan 19 05:36:45 2020
New Revision: 356879
URL: https://svnweb.freebsd.org/changeset/base/356879
Log:
vfs: plug a conditional assigment of lo_name in getnewvnode
It only matters for witness. No functional changes.
Modified:
head/sys/kern/vfs_subr.c
Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c Sun Jan 19 04:13:19 2020 (r356878)
+++ head/sys/kern/vfs_subr.c Sun Jan 19 05:36:45 2020 (r356879)
@@ -1669,11 +1669,15 @@ getnewvnode(const char *tag, struct mount *mp, struct
* that we can compare pointers rather than doing a strcmp().
*/
lo = &vp->v_vnlock->lock_object;
+#ifdef WITNESS
if (lo->lo_name != tag) {
+#endif
lo->lo_name = tag;
+#ifdef WITNESS
WITNESS_DESTROY(lo);
WITNESS_INIT(lo, tag);
}
+#endif
/*
* By default, don't allow shared locks unless filesystems opt-in.
*/