From nobody Wed Jan 03 20:33:20 2024 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 4T51dD4DGVz56f4C; Wed, 3 Jan 2024 20:33:20 +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 4T51dD3HTWz4Mm4; Wed, 3 Jan 2024 20:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704314000; 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=zSvnPe/DnRa9iyblx2odWom1e2jEhfrzgKVjwQo9CZo=; b=WTLNDcWI0DWMIUmAIyEMCdIc6kOnxVaDmrp10nK2YVqIny2kTKSugDTMbyUcDTBIYGC0b2 4sjrKJskngY4RwdtnH0uyb2WpMRpcHIXlm27lluQWCVLFu93bWu/ke1bsOw2+sbcPCOSb0 oYycDCVYt0wNeF1TxQ6ZKZA/u5su7jPkHnZuzaete7b9moddjUXx2lsdSKG84sZeBlBaBn 97cMuNHfM1+MSEKQT4vPZ8DOZoB+TYiQTtMccbjblrB91+oK7SLz2rPzhBiNemNj1GBH3R PgfLlOpqbTNaOBcbVvzmaFqIYGyL47wZ7Rjxd/CsCyD68Hizv6AtldbME14XXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704314000; 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=zSvnPe/DnRa9iyblx2odWom1e2jEhfrzgKVjwQo9CZo=; b=Y2bAao0xJ5F/NU+jyigaXlhoA3wCb9bSbvQwX3DF9G3RU9n58wFDOGD/IxRX/yj8g/yFWo pp/11yZDQzwfWoACq7EV9KlCQzhMtyqXjJ3zSwBRhpTWpt5M+sqRdHHB9WHA5rKdrZ23fr sbWbY/OHKGZpWnGQTRIY0Pz4YeOjd+bOzR4EFobfO8qK37yF/o5xxU+TvD880p0NyKDV/2 tUU3oqgCb0IBvVmaZoJbmNgBPUVzDjGyN0JhfiFCdkUmarIrsmBeCKR1E/mJiTrxv/RTmo JQLgruWn0zSdQQnOHNWpAv0ZLDhs6J49rv3/iFib0i7blNH6jfSJIFRAsSJsaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704314000; a=rsa-sha256; cv=none; b=nbKgc+N7G+fSnZOaPQu4L7imTWC+zBM9m7+5UU2ljYe88HMa4mvWizLSdiArTk8mjkRQ63 BkJd3lqoBfHQrF+moBHyCmuiIZC4V5PIefELNnUXGNw30Lrq+sY6IELwRI+/ck6Uwy3cFq Uxu9EWw23EsZyTaxgtze6V4iPxgAa2AuKV1jDU7fhqAgIuZiyCXM0uifJbeRQTkHMiW+cd PH4BfOqFpNlkkL7mZX6l1LFCNB+QYTzbXVPMnVHH5HiQuKAFxhQUnACZiMb0Ry6x5Nx38v MoCYzOrEXIXPGt9FIYwU9AWBnDqnQp7HEdiy5xyJMwfkWy9I39tvnHxonUhvLg== 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 4T51dD2KnNz103D; Wed, 3 Jan 2024 20:33:20 +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 403KXKCS020541; Wed, 3 Jan 2024 20:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403KXKLB020538; Wed, 3 Jan 2024 20:33:20 GMT (envelope-from git) Date: Wed, 3 Jan 2024 20:33:20 GMT Message-Id: <202401032033.403KXKLB020538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b636e35bb724 - stable/14 - vfs mount: Consistently use ENODEV internally for an invalid fstype 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b636e35bb724b9c777fed6c7cf4a713d14316f36 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b636e35bb724b9c777fed6c7cf4a713d14316f36 commit b636e35bb724b9c777fed6c7cf4a713d14316f36 Author: John Baldwin AuthorDate: 2023-11-18 19:08:34 +0000 Commit: John Baldwin CommitDate: 2024-01-03 20:18:44 +0000 vfs mount: Consistently use ENODEV internally for an invalid fstype Change vfs_byname_kld to always return an error value of ENODEV to indicate an unsupported fstype leaving ENOENT to indicate errors such as a missing mount point or invalid path. This allows nmount(2) to better distinguish these cases and avoid treating a missing device node as an invalid fstype after commit 6e8272f317b8. While here, change mount(2) to return EINVAL instead of ENODEV for an invalid fstype to match nmount(2). PR: 274600 Reviewed by: pstef, markj Differential Revision: https://reviews.freebsd.org/D42327 (cherry picked from commit 3eed4803f943e2937325e81140b88e2e8eea8deb) --- sys/kern/vfs_init.c | 4 +++- sys/kern/vfs_mount.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index c57e1471e356..64263caaef98 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -149,8 +149,10 @@ vfs_byname_kld(const char *fstype, struct thread *td, int *error) loaded = (*error == 0); if (*error == EEXIST) *error = 0; - if (*error) + if (*error) { + *error = ENODEV; return (NULL); + } /* Look up again to see if the VFS was loaded. */ vfsp = vfs_byname(fstype); diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index c42fcfa7537b..c36fda4e8a9e 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -996,7 +996,7 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) jail_export = false; error = vfs_domount(td, fstype, fspath, fsflags, jail_export, &optlist); - if (error == ENOENT) { + if (error == ENODEV) { error = EINVAL; if (errmsg != NULL) strncpy(errmsg, "Invalid fstype", errmsg_len); @@ -1086,7 +1086,7 @@ sys_mount(struct thread *td, struct mount_args *uap) vfsp = vfs_byname_kld(fstype, td, &error); free(fstype, M_TEMP); if (vfsp == NULL) - return (ENOENT); + return (EINVAL); if (((vfsp->vfc_flags & VFCF_SBDRY) != 0 && vfsp->vfc_vfsops_sd->vfs_cmount == NULL) || ((vfsp->vfc_flags & VFCF_SBDRY) == 0 &&