From nobody Tue Oct 24 00:46:30 2023 X-Original-To: dev-commits-src-branches@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 4SDtfb1YTGz4xD4F; Tue, 24 Oct 2023 00:46:31 +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 4SDtfb13qNz4N9T; Tue, 24 Oct 2023 00:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108391; 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=B3g7FG5ukQ3UhgtxwXILJlRS+NSJtdci2qrN+lnGaI4=; b=gdfRDYtTN0VhWiOeNR0nqWO40LWLc/te7E/Z2BY6lJNp+sZ4lm658747xPpnCJ/1KSADM9 hplUAEFJm6IKJRjD5SN90OY9r0PdesMpd9UD89s4Z3SpV8rjmQ8L/WWAFCnGTUPf3XlRPn Bvd3Ph3jK3vcOnJ/0chhAO4t+xfwoLILs6Lyqok2CM76iFdHcDnZd+gZl4ihvH2CstVLfi c/mOCG78VFqFHaOqguJOYClLD4mjGpnk63TFhJQUjBlzpPISgDX5JWjdbjZE5vcoRLHYfI 5Q1bGRvJKimmH46jDpccWZfGgIQVCbQY96DmTG6Vk2bYbjdK3sqGz+EneitQeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108391; a=rsa-sha256; cv=none; b=al2E/S1OdIvaT5jo7BZ7n0u+TNbr/3nMo/wDTxn92i7S1GetAMRY6e2LjPllvFnSk0X5H5 IeqrEnciA2EwrcxuIUwPDyYNNHDovU7kJjfJpnDZGARRGGUSfBiBKpzoiH9h5JQE6Yfi67 rQUgI8ZAEPsecZV6mfkH0w+o52OacP5EzDegsPJtp+hPsg1wJhJFoiRbygcgiqUGd+aixI WySeC3ZJVy8HPHOl2CL+2Hu8+z6ZOHsbkSG9cg+Zg1Apyz4rdPv3WAv8x+Q1oswVHOQJ/1 R/N6YeGEoCYDi9fairtbvvMsP9p8m880Wzl1wDR5S1QvUp0HtRXA/oI0lDnfPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108391; 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=B3g7FG5ukQ3UhgtxwXILJlRS+NSJtdci2qrN+lnGaI4=; b=FlwjHVKIVCtaPAw093hju8LW4nT/dBc/i38x6TsPDPNk6ydvD5niDTX2rRp4Mmnw6akmFa ihrfFLq4j90ryCCHCH2yDP5rcft5hk1Y4K+P2ob6oMdLEU7neBwF2S72wpWu5n7nuNSBds e0PXf66izGMSX25FSZtw/tof1Urb9XGXoz32RRDaisuFB7FBXq/DGTwzKmAstSMi44icBY kY6ZInmyyBbY4rHbBcXiSCL9C9dOa66TxLd/yDPJO43gKBfNCXrn5Rqdg+WooxHmYLxRr9 PB6RbMHcTBnViWLrT9DWiQzVA9BlfYoDxwhF9pAB7tU+UQBQXG9NcpqIroX2gw== 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 4SDtfb06HTz1289; Tue, 24 Oct 2023 00:46:31 +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 39O0kUl0004339; Tue, 24 Oct 2023 00:46:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0kU8X004336; Tue, 24 Oct 2023 00:46:30 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:46:30 GMT Message-Id: <202310240046.39O0kU8X004336@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: be2333b68d71 - stable/14 - nmount(MNT_UPDATE): add optional generid fsid parameter List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: be2333b68d71bea99768749db3057f4fd66f9d5d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be2333b68d71bea99768749db3057f4fd66f9d5d commit be2333b68d71bea99768749db3057f4fd66f9d5d Author: Konstantin Belousov AuthorDate: 2023-09-29 18:42:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:46:01 +0000 nmount(MNT_UPDATE): add optional generid fsid parameter (cherry picked from commit 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64) --- sys/kern/vfs_mount.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8364081585f8..aa4642c0ba8c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1313,9 +1313,10 @@ vfs_domount_update( struct vnode *rootvp; void *bufp; struct mount *mp; - int error, export_error, i, len; + int error, export_error, i, len, fsid_up_len; uint64_t flag; gid_t *grps; + fsid_t *fsid_up; bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); @@ -1378,10 +1379,24 @@ vfs_domount_update( VI_UNLOCK(vp); VOP_UNLOCK(vp); + rootvp = NULL; + + if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, + &fsid_up_len) == 0) { + if (fsid_up_len != sizeof(*fsid_up)) { + error = EINVAL; + goto end; + } + if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + error = ENOENT; + goto end; + } + vfs_deleteopt(*optlist, "fsid"); + } + vfs_op_enter(mp); vn_seqc_write_begin(vp); - rootvp = NULL; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp);