From nobody Sun Nov 12 00:32:04 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 4SSYR82gXjz50qTm; Sun, 12 Nov 2023 00:32:04 +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 4SSYR82FvMz4VH5; Sun, 12 Nov 2023 00:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699749124; 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=WqyVmCf5z8T49fjwa7tMcJDwu0YIPsISZQF+1S//lEY=; b=ubs3w3PJlJ3lOKGT1k+SHNyzbrntwo4NEt4JcthOK9kisu8NrvRXFUCVqfXp9jWSLFLTzC 5ER/oewFh+2yJHDrM/MGPbgZeNTB4jbLwQJ8NQ1QdgFlY0T/fz41YFpErscMKlVOKqvorj J76kOA1vo5zLGPTze7K5AIFxV7IYTOCeVJQOXcAPh0urfUSyTUPZ/VZdoGRM6QD25d6JRm EqN39kL4lnnxRJCJSc9lRomSfzg/QeAQ4uBVp7ybjSVMbogv2w7kcc++to42q3BMfWRM4Q axYb0vHIVw+kTDvTMQXIRz+cuUbPd2QQmNEDXu+3KJ9rf7J1iDG+uxmjTPl9XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699749124; 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=WqyVmCf5z8T49fjwa7tMcJDwu0YIPsISZQF+1S//lEY=; b=uPNrUJzcp0oM5NfTYwUJAf2sAB3GNTVYcbTPJlIAX1b6dm+pIXRdALw1MIfPxMBda6iDtm P65Ly/Vb15yh0EUmMIrqNRIud2cIam1pVjQFVJDFikgL1T4qefw8w4p/1apRxwRq9gwS8E 05wSvbV0SaPLsG8a0wLFzA7JGlEvyq/3ebIAphg3O7dlPo38PTWPbgCEdMMlFcy0bcjSIE 9KsrEeiTPMWOwRj0fCS8iN5Ss+bWGYbG1IMb99jYtTlNP4GlD/qNRTDE1W8VOMgiTkxNDM u8FLmhfn7DS6S2WKmxF604ANJEeVE/p7jIJp/+wr90AqF//dT7Lfe1xVX91Zhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699749124; a=rsa-sha256; cv=none; b=tTBUG78/qZVrmTHbRJ1U+BlNOyPC7c212MBv+1Rj2H4sQGH/FGykFqp7rPHcFXbBhfB6/r kI5O23nkSI59EdYDq/d3MS67xZEo1lluweM6wzA0YMDORHeE0JDDsx99TIT65IubUU28qX 22GaASQlMvj5gTL/7h9Ay5QnwzB2SQUIYdRchnl7b1v+epUXap2qKeMXY7hE/DTxtSQ9iZ pxzQa19X1S0RGUXA2GPKnESyxCIi0ed/ry1SvCRalvSEgF42FLNpdlJgsYbhioocciapL8 RY5vi/62fu1Qw08zGwHNGnjVC6jH6aKbQB/4i/VCRDOUjLNQ9Vv4kzeY+WC2Rg== 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 4SSYR81K3Nz126X; Sun, 12 Nov 2023 00:32:04 +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 3AC0W45R072667; Sun, 12 Nov 2023 00:32:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AC0W46C072664; Sun, 12 Nov 2023 00:32:04 GMT (envelope-from git) Date: Sun, 12 Nov 2023 00:32:04 GMT Message-Id: <202311120032.3AC0W46C072664@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: 608ccfc29fb4 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 608ccfc29fb48d8edc59a97382936790c02d27f3 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=608ccfc29fb48d8edc59a97382936790c02d27f3 commit 608ccfc29fb48d8edc59a97382936790c02d27f3 Author: Konstantin Belousov AuthorDate: 2023-11-09 20:18:47 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-12 00:31:47 +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 a4a981603ab6..4597ae09a831 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1221,6 +1221,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) { @@ -1235,9 +1237,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);