From nobody Thu Nov 9 20:22:01 2023 X-Original-To: dev-commits-src-main@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 4SRCzY4Dlcz50Lld; Thu, 9 Nov 2023 20:22:01 +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 4SRCzY3j02z3Vww; Thu, 9 Nov 2023 20:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561321; 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=hcVtYmr8nW2zR2uOH00cvbCQ0LR7/P4YvBPQlCm2LGY=; b=uHawMn3rvGjBOGSwQ0qSxU28vs2NLeFnRFehF29ljcinwV3OSF1Fk0KvLa2oGLQXstgl1F NZWUc+/XIzOwlc6IY2Q2er0L27IexXcCO8MhxIqntb3LiobU30MX7mFVk3CqibQsMVakv+ O+OsUJ4P1FjtUmnfW4lhGM73/MuaVfwZXU5L5yvyyOYppwxNkKwTrdc4OXqalR+oG33lbM nehUEnru10imj8C3O8Tf3o0ZCXH+8gXDnttGRX5J6WUee/nFhCNZtl0x2BbpmzGrRzqQ4/ NM10BDRqzedxIxVxR8GPdsWcf/kwKUBaG6q32gk9aIJTA7Zu+czJC08RK9D9tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561321; 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=hcVtYmr8nW2zR2uOH00cvbCQ0LR7/P4YvBPQlCm2LGY=; b=uX64EsRGVwih8A9QWqSQdSoSc5SIZEoQKy1qN1p0VHjR/9jL2juo0tLLNgaL/zedgcj883 ipvzO6swUebz5w+HexoGdnzWZw35tYFNnBr5aQnNrghoD7idZYduY7zoLAK588WVi6dkM2 p9IvO0ocnetuZo9fcPcwGCw5WhYVqQ21NpFgdo5C4/XQ3Hi6Fj7mWPOGL6JNrLPGkHFR1q EQr6ZpNa8EjvoIpiswRtlgSdE55htaXUu+fsLfDHosYYLmwt5S0WBndqJW/tKCrjzjvalw cDWcU+2g0HbD5/B4hs299td3P/Sqiw8D7gcuAhChu4dn4GA8CuRo/zGUTb4H3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699561321; a=rsa-sha256; cv=none; b=eABOhhcxwrHACNq2GG3zJDUNpqaouCIRgBJQdJEKc1FPaBdWgjDYoAymbGZf9YTDbFAHbK CXaa7cR+VMgWr+MTQY6lc0/7/HruPWy1j4bdQ2ufwTawKbHA98TyAjSCE6JdMG2qaLUxTX /ZqL6luaeKNnxFrl40giwKFEuglMopsW4FBKFD7t15P+28V+VoQInthk4yTOhuzpo3uij6 taleiK5SiIXdxxL+KOWKsbtflutHcPQqSoaQjDn+QNaIIJXyU2Xj4m1ZxajfJUOBWsN9hI 7ZdjRXDVWbWn4bPnZG/VDGC9ej9xWzAId0SarRNMLATc06oBRli4E4GxrbObBw== 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 4SRCzY2X38zVXV; Thu, 9 Nov 2023 20:22:01 +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 3A9KM1bt049069; Thu, 9 Nov 2023 20:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9KM13G049066; Thu, 9 Nov 2023 20:22:01 GMT (envelope-from git) Date: Thu, 9 Nov 2023 20:22:01 GMT Message-Id: <202311092022.3A9KM13G049066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ede4c412b3ea - main - vfs_domount_update(): ensure that 'goto end' works List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ede4c412b3ea9289ef42c664b01b6b5ff7eac434 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ede4c412b3ea9289ef42c664b01b6b5ff7eac434 commit ede4c412b3ea9289ef42c664b01b6b5ff7eac434 Author: Konstantin Belousov AuthorDate: 2023-11-09 20:18:47 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-09 20:18:47 +0000 vfs_domount_update(): ensure that 'goto end' works We need to vfs_op_enter()/vn_seqc_write_start() before jumping to cleanup. PR: 274992 Reported by: trasz Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 --- 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);