From nobody Mon Feb 07 09:51:01 2022 X-Original-To: dev-commits-src-branches@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 0A22719C1B99; Mon, 7 Feb 2022 09:51:10 +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 4JshGx5stDz3sFv; Mon, 7 Feb 2022 09:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227469; 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=ppF5SMtxC2YHb1QeterMMsW/77rad+rVIe8VBvTTdWw=; b=XP84AhY6ZLOsXfuqrKSeDAgixF/mM7KWz7Dvcv1AspjL4nqbc8z353Mszerl9MrGrgyQg7 H6GSzp1zkPCNDOw27cAIzeSlLyuhngOiNXUD4S9LxfHRSQUHu/mQeb9/Ywm0/kxz2QtZ+h E9tcmk3IffpX1e7J1lr5xDz5xXbMNePUgHRcWj6TfsM6CNEfKvBci7jTQcSPyz+vu/o6Qz Rv6A0gaIEAvCtmkJUjv+RYfCZrhrmIAnFIw2irRjszRNnJNUK+TdXBY98XTzUHFfKFBGZR E3Ax8BxXvNipJMs9ajcCNVHDcT7+6Cj7/rZpqgK/ZXo1Kvaui1REFeUf1/dzPw== 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 5625D237B1; Mon, 7 Feb 2022 09:51:01 +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 2179p1B1059212; Mon, 7 Feb 2022 09:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179p11t059211; Mon, 7 Feb 2022 09:51:01 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:51:01 GMT Message-Id: <202202070951.2179p11t059211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: de8aecebf9e6 - stable/13 - ufs, msdosfs: do not record witness order when creating vnode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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: de8aecebf9e641ce43102f0c77689a4ebb5a6a01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227467; 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=ppF5SMtxC2YHb1QeterMMsW/77rad+rVIe8VBvTTdWw=; b=aFuHr8zqnifqH7I2GxGOexN9ghMTgd70Bs9QU47MEAWf2X2qJojJa5/Xf99dBfVAx2c17+ LtiBnPux/iwGBAKGhKnrJcHWKj1E9Tnnv0anqGRpbetzLraWTnxlktEmQuRzb0pATOP/eK vBCJolCFVEaQMNJmSqnovTFEgjZivOqy5nBMMdDsTT7LUpWjOyCJFuwI8BqCRz3er0wvNF ZGh4diT/jGN76lXZfbmzuhwkCXkArNg895znZFuoboiI+dZ5fHu2xTClG9rlaXI8zZnnq3 Z7+oBXoFBDMw4jDvtBWafUbS+o4POrVl6Xi4gHjdIk2RsMYWy5k7U5w56Xp0Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644227467; a=rsa-sha256; cv=none; b=hXkrfdJlO3O/02lOnK7+20m7WbDXFeajpehklJVB5UtX3CB1mmRstekwZsAYYM2pWXOYVI tD+rvJCSiTkUXPjSeOdyzcbQ4svvhV27TsWozxg2ifLBF5goaHNDlLbhd2cqd4lmZZ9WGA a7Q/E3IThVqDbFOcjfVgp05gdBvT/PhccJRvuDbVzUpFF3zJs5CTQTrTMprDX/P+AjalUP ETOgW/mIBmjvmlP5F/RYlqbbEG51sVvIkQVNQU5KoBay5Gm97a1xV1f3Ag5CyB6xEsyl4P DVQEqeF/Wc6PTrVN6TBd9z6v0l4ZXL8fN0znAA5IzAd+ljsDnG5imLItgFJtiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de8aecebf9e641ce43102f0c77689a4ebb5a6a01 commit de8aecebf9e641ce43102f0c77689a4ebb5a6a01 Author: Konstantin Belousov AuthorDate: 2022-02-01 05:16:30 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-07 09:38:50 +0000 ufs, msdosfs: do not record witness order when creating vnode (cherry picked from commit 303d3ae7e8419b457078598b8569e57a5e3fb5ce) --- sys/fs/msdosfs/msdosfs_denode.c | 2 +- sys/ufs/ffs/ffs_vfsops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index a4874b8f4f9c..4e2391b3bf2e 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -180,7 +180,7 @@ badoff: ldep->de_dirclust = dirclust; ldep->de_diroffset = diroffset; ldep->de_inode = inode; - lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(nvp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); VN_LOCK_AREC(nvp); /* for doscheckpath */ fc_purge(ldep, 0); /* init the FAT cache for this denode */ error = insmntque(nvp, mntp); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 90cf92305022..89fdc4336834 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1924,7 +1924,7 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags) /* * FFS supports recursive locking. */ - lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); VN_LOCK_AREC(vp); vp->v_data = ip; vp->v_bufobj.bo_bsize = fs->fs_bsize;