Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Nov 2023 00:32:04 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 608ccfc29fb4 - stable/13 - vfs_domount_update(): ensure that 'goto end' works
Message-ID:  <202311120032.3AC0W46C072664@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=608ccfc29fb48d8edc59a97382936790c02d27f3

commit 608ccfc29fb48d8edc59a97382936790c02d27f3
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-11-09 20:18:47 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311120032.3AC0W46C072664>