From nobody Sun Nov 12 00:31:34 2023 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 4SSYQb0dhDz50qLX; Sun, 12 Nov 2023 00:31:35 +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 4SSYQb08TZz4TpY; Sun, 12 Nov 2023 00:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699749095; 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=7EyAUkp6UbJNW+yMCPrwuobaNEfr7NkBr4qmvjSkbhA=; b=vgQjdc3qXCas3HBsjB5kAWKTI6NfTILBus08SILXGZw7PQcTmcuWD11mFTVoqkcxu4NxXc fGRhaO4CmrVOAn2LABPQn64TdGRhcV0Oc9F/xckFfV02feNoK46CvnptdX9ZsLtkp2lH3D 8vr09xfRMsM/HU2Vkl5uU07QLGuqihkFApxtXb3trV/tKAWzh0if3/zrlCFfF26CFP6oBz tlaYAaCtq9tyfLyvk5iE5+C9aQwW6R5/wHTHFAUZzprUD427ZNp37yXDKAs4mmnxaKewcs 3g5nRy7WIbouHtk+wNbfa++T5UbSsNuMNmw64F24fYYs91kG3aRfHShbL1gpyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699749095; 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=7EyAUkp6UbJNW+yMCPrwuobaNEfr7NkBr4qmvjSkbhA=; b=Sszw8+lLQmet+9UMUjL3eEjF6N/47sCleQ58yqTKZCJukTUwvjdtjr1KBx8/+lacVlVtba 1HLCnMvsR+trHIRw8p44r5SaoPg1p/lRFeOZR3YyUaNTsunezccAJJiJW8U7RnajgDcX76 7suOLTTrotlbi6P53KZJj2cGzSccyqzSg2Qhvs+wHDxEunGkawAkCF2uDZvtijz5CjkxTK xfCNhSN/D9RvcjhH85WXXWONbRl82BVPZc+Fbmyz8Tn8kqPtt80AqEq8yAumTzPFmmb7cY G6fEsAVRafirDy7q+PvBm1ykvVs+nj6RF2xOoumOlx2ThN+j1ls61shfvOG99Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699749095; a=rsa-sha256; cv=none; b=dvdpphqCGYIVKqTbjfVR8hsIut/GMph9hS9SiHV5szjBeYpkTqDhfwz3kQ209EVNnAi0eD jmFejfzEjvxuLPv4GRhowZfFHl5CMXR/scn9cERchmMC7cbZZgYYAG0665j8b1orwiaHOM 8LP6aYbOXUOjFo/YLZJiJovSnnfy4AUku9K+tF8FVe8d91lzxBWypHeRRV60dDy3+QRaoB mucAnHl/shUdg70QJisYnqcGJlVk1cd4yF+WourBR+xR4DS5AsCmUB1boO/cu9FSHGWpnk F/H8miD9CXp+tFf0ybrTFzIBWT2raCGY4V3mPwgPvLjs/6I6mLDubuB92J2H7Q== 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 4SSYQZ6K15z11vB; Sun, 12 Nov 2023 00:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AC0VYw8069096; Sun, 12 Nov 2023 00:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AC0VYuk069093; Sun, 12 Nov 2023 00:31:34 GMT (envelope-from git) Date: Sun, 12 Nov 2023 00:31:34 GMT Message-Id: <202311120031.3AC0VYuk069093@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: d0b4efe6d294 - stable/14 - vfs_domount_update(): ensure that 'goto end' works 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0b4efe6d294940d668171071eb71aab870139ab Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b4efe6d294940d668171071eb71aab870139ab commit d0b4efe6d294940d668171071eb71aab870139ab Author: Konstantin Belousov AuthorDate: 2023-11-09 20:18:47 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-12 00:31:13 +0000 vfs_domount_update(): ensure that 'goto end' works PR: 274992 (cherry picked from commit ede4c412b3ea9289ef42c664b01b6b5ff7eac434) --- sys/kern/vfs_mount.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index aa4642c0ba8c..1a559bfd998e 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1380,6 +1380,8 @@ vfs_domount_update( VOP_UNLOCK(vp); rootvp = NULL; + vfs_op_enter(mp); + vn_seqc_write_begin(vp); if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, &fsid_up_len) == 0) { @@ -1394,9 +1396,6 @@ vfs_domount_update( vfs_deleteopt(*optlist, "fsid"); } - vfs_op_enter(mp); - vn_seqc_write_begin(vp); - MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp);