From nobody Wed Oct 19 03:08:15 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 4MsbJw0r9Sz4gYDq; Wed, 19 Oct 2022 03:08:16 +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 4MsbJw0FyMz3bDB; Wed, 19 Oct 2022 03:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666148896; 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=QEYrPGiFfOT+skA0mBsegSjyznHYekwinXr944tUQpI=; b=ELMRa5RwAzboXj6zK7WeCnB1uhRSkSaszx/21SHHfQEpnolSaQHjCY2QUSYXrt9nGGieQb xWTUXyveNfi3RWL7VNGogB2B9ot5lC3t6eog1FmepZ5B9lZQHE09J3UQ1JdyGWZ/FZWioT BQYZEO94rKyey85yeM9pZpjGeB7cmUsBtgS1UT6R74kDuSAEdSNAYZt+RwOOR8Zwpp1zcZ iNDMr6KHDso4GuvkpDn+dSvBXADNN22475Qag9OhR1Uujra6fpcp2VPabOWbSY0sePEHeS 6fH7D8QVwTHy6jaGpdwbfZ6X1XOXsM9M+67MAN3CBYt2CBJ2eT2GQLkwH2iN8A== 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 4MsbJv6R8RzP0h; Wed, 19 Oct 2022 03:08:15 +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 29J38FuW068306; Wed, 19 Oct 2022 03:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J38F8x068305; Wed, 19 Oct 2022 03:08:15 GMT (envelope-from git) Date: Wed, 19 Oct 2022 03:08:15 GMT Message-Id: <202210190308.29J38F8x068305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 91a60385457a - stable/12 - Add missing change from c76461e064b675c8edd3b1d9bb917905a885a860 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 91a60385457af7dab3fc650b77e8154d9787f578 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666148896; 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=QEYrPGiFfOT+skA0mBsegSjyznHYekwinXr944tUQpI=; b=EH//LZCq6L4Rzv92XdIOVUz8Qpuc34Z734Y5B/UperOQeDkv2a1xP50r3wx2Djnpcy6Wz3 iA+4uku6XUl3yl5pmpEQAzL08WVbGKp22nKOyWj9kKDzz1+ePQagF/b8bpRqMrPjTjaYVH 4sHulRUR4Bp5jMevQw9O3q/WgfpGiBbiSvwIxVUPifWcIepGoQHPWpDC11Gev0gwW3sGEo 0WYgstBvh+DKWShOcqgBMQTefqF23I3y+OiBYcBYLYm6912Muxzmpawqzy6tqr2d57H172 2SJt83PBwN4Af9AuvCcjgZy81wvPttx6CjcX3bmADBojFyFBZgNVBbiDMFHjFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666148896; a=rsa-sha256; cv=none; b=AM6JjVKA18Zp8Z3ZXcCSLs7DVcA0zEBQ1AfOr03AaJiw7psmEUDSnjVcE7EFBBTLBHMuvB OmlJR+kEb5ntDM2e7qQk8r7zoNg0ofXAsmJOjNJ5qibW1f5LY0h4rsdDjxbN1clbUGBNWr Sc5oX/LvCLCyWTgXkgrN4afgcNaIj+LA2kWxeWLgMzZh5WzeSFsCk4ESy2K3CY7SeVLEyW uDmK+zwkVnMHaj/ssC1WnTJy1NWWwbuLD6dhDrybPimI9n+fWzL+pdl5S+csbvljWIrXMi Rrg3WGbKBIhiZDNbS+RJyJzOxB6Pq85brnjJ3gPDRxGYso5yEQ8nydhtaQ2SrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=91a60385457af7dab3fc650b77e8154d9787f578 commit 91a60385457af7dab3fc650b77e8154d9787f578 Author: Alan Somers AuthorDate: 2022-10-19 03:07:21 +0000 Commit: Alan Somers CommitDate: 2022-10-19 03:07:21 +0000 Add missing change from c76461e064b675c8edd3b1d9bb917905a885a860 Direct commit to stable/12 because it fixes an MFC mismerge --- sys/fs/fuse/fuse_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 311ea8a049ef..ce30382e9ade 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -456,7 +456,7 @@ fuse_vnop_advlock(struct vop_advlock_args *ap) } out: - VOP_UNLOCK(vp); + VOP_UNLOCK(vp, 0); return err; }