From nobody Tue Apr 22 21:51:57 2025 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 4Zhwtj4t8Lz5tFTh; Tue, 22 Apr 2025 21:51:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zhwtj1B9xz3g8D; Tue, 22 Apr 2025 21:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745358717; 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=OJ2WtnhAwCmQJ62lNaG7/HsTFKQ2Hxw90vtcXmkrPtU=; b=u3yWsfO5FYR7auT4jVZgy1dOsK1RQmgaeJ1wJzBnFXTqD3iyvs6U622tP8oVeSvxnyWIKy Ep6SAbskVbMhOgM2PNMnIJ6PvGNTEldwZO1pyd3qkIZXjyDQb7LbjppukZCuF5DF3xdyBP 6u4JA/d7ulDL38cK5n8YqIEKHSmEjdfBNLQcqwc3huXhNHC1/Mm3rZyso2pSBzyVxuB3UX LcV2ytCZAb0hZpAANKpeS89T7LEAB53FRLhdAwn3dluqh9ohffZGJRdKudeJ6D0QpmpBDD UENmBg0GF15jSfLUkKOCYAgR6/HtxlRnb1V4r8nmSSYB/um0pCzVUoeBWAhyOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745358717; a=rsa-sha256; cv=none; b=R+hQY+az9q4yDmBNxBHSIr/oGrfBBhyiHCve5orGk0AfHwLfmBj96X2iaIEYYPPK9c3OdF P3cNd1kaNV0jlGR0XG+40W1Qx9fojd+9fB1MGM7bAXeUbXIWV+R0yChL6vclSHf7U4D2Si 6CRRhbm58CdXZ46FkDH2OjDeV87hsinLP5yAsyGtKWLBk8KlxEoKztGnNPJUqahyINv/uQ 6MmL40Zs/dHjX+w3d51MVjJwFIjT4O+x2rOERlkeWzUkx3jTSQO1WtMJyz7AXN8cV9Ubem 0xLDXQZg844Fkh+/ux2y9LZ8oozAjk8DcoUAR9yqWZRlvsM7rkQwVb9F265MOA== 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=1745358717; 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=OJ2WtnhAwCmQJ62lNaG7/HsTFKQ2Hxw90vtcXmkrPtU=; b=oImTkkz7Jt0o64Zp7lAXq6IryRqYVnBvmeAP3PH6QEi/ldyCOgZ5Rfc21w+qqIodV8ZP1K QwCkgr3ACRDP7qDvCH4tiJWlz1LfmD39sgKXXdgdkhaLCh5kXRXsx4MNDvUkd2RuH9t/0v 7KeJ41X5a/megKyHuj0d06IB2bmFTJ+O8NaHEAcI+v5wQDQT62CSYQbruOXC6IceUtr04q jDXoJ6AtZZBS1LM+mY6erfIrlQMTqcXG5O1A139M/WfxvPVzGqjEQDHee3RmpMTAEZGq/u crzXySO9DE3u72kg2IMpUzcsBhLV90RCWN4kT8ctirJxJeCyIO+OB/0T8e2vbQ== 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 4Zhwtj0nc7zd7B; Tue, 22 Apr 2025 21:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53MLpv1H098086; Tue, 22 Apr 2025 21:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MLpvQ2098083; Tue, 22 Apr 2025 21:51:57 GMT (envelope-from git) Date: Tue, 22 Apr 2025 21:51:57 GMT Message-Id: <202504222151.53MLpvQ2098083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a123502ef781 - main - Search for mntopts.h globally, not locally 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a123502ef781ea052e842af25c7aeb64fd9fe217 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a123502ef781ea052e842af25c7aeb64fd9fe217 commit a123502ef781ea052e842af25c7aeb64fd9fe217 Author: Brooks Davis AuthorDate: 2025-04-22 21:51:12 +0000 Commit: Brooks Davis CommitDate: 2025-04-22 21:51:42 +0000 Search for mntopts.h globally, not locally Change the include directives to use instead of "mntopts.h" now that it's installed by libutil (the latter option was dubious regardless since a -I${SRCTOP}/sbin/mount was required anyway). Reviewed by: olce, imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D49952 --- contrib/smbfs/mount_smbfs/mount_smbfs.c | 3 +-- lib/libutil/mntopts.c | 3 +-- sbin/init/init.c | 2 +- sbin/mount/mount.c | 2 +- sbin/mount/mount_fs.c | 2 +- sbin/mount_cd9660/mount_cd9660.c | 3 +-- sbin/mount_fusefs/mount_fusefs.c | 3 +-- sbin/mount_msdosfs/mount_msdosfs.c | 3 +-- sbin/mount_nfs/mount_nfs.c | 2 +- sbin/mount_nullfs/mount_nullfs.c | 3 +-- sbin/mount_udf/mount_udf.c | 3 +-- sbin/mount_unionfs/mount_unionfs.c | 3 +-- tests/sys/fs/fusefs/fallocate.cc | 3 +-- tests/sys/fs/fusefs/mockfs.cc | 3 +-- tests/sys/fs/fusefs/mount.cc | 2 +- usr.sbin/autofs/automount.c | 2 +- usr.sbin/mountd/mountd.c | 2 +- 17 files changed, 17 insertions(+), 27 deletions(-) diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c index 99f1cee8ed2e..5b357655b642 100644 --- a/contrib/smbfs/mount_smbfs/mount_smbfs.c +++ b/contrib/smbfs/mount_smbfs/mount_smbfs.c @@ -47,6 +47,7 @@ #include #include #include +#include #include @@ -56,8 +57,6 @@ #include -#include "mntopts.h" - static char mount_point[MAXPATHLEN + 1]; static void usage(void); diff --git a/lib/libutil/mntopts.c b/lib/libutil/mntopts.c index 0912b1e1a306..1d9347e3108a 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.c @@ -36,14 +36,13 @@ #include #include +#include #include #include #include #include #include -#include "mntopts.h" - int getmnt_silent = 0; void diff --git a/sbin/init/init.c b/sbin/init/init.c index b6908f19fd82..b345c8fa219a 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -69,7 +70,6 @@ #include #endif -#include "mntopts.h" #include "pathnames.h" /* diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index cf603a63e394..03ae69272e1a 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include "extern.h" -#include "mntopts.h" #include "pathnames.h" #define EXIT(a) { \ diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c index 6035857578ae..30c34ae32f31 100644 --- a/sbin/mount/mount_fs.c +++ b/sbin/mount/mount_fs.c @@ -38,13 +38,13 @@ #include #include #include +#include #include #include #include #include #include "extern.h" -#include "mntopts.h" static struct mntopt mopts[] = { MOPT_STDOPTS, diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index d8d64eb5a656..3eddbefb9a03 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -55,8 +56,6 @@ #include #include -#include "mntopts.h" - static struct mntopt mopts[] = { MOPT_STDOPTS, MOPT_UPDATE, diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c index 8b1797747a25..2d65494421ef 100644 --- a/sbin/mount_fusefs/mount_fusefs.c +++ b/sbin/mount_fusefs/mount_fusefs.c @@ -49,11 +49,10 @@ #include #include #include +#include #include #include -#include "mntopts.h" - #ifndef FUSE4BSD_VERSION #define FUSE4BSD_VERSION "0.3.9-pre1" #endif diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c index 9128914bc2b0..36e1c524922d 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.c +++ b/sbin/mount_msdosfs/mount_msdosfs.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include /* must be after stdio to declare fparseln */ @@ -53,8 +54,6 @@ #include #include -#include "mntopts.h" - static gid_t a_gid(char *); static uid_t a_uid(char *); static mode_t a_mask(char *); diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 6ba51eeec588..55adb01fc1da 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -67,7 +68,6 @@ #include #include -#include "mntopts.h" #include "mounttab.h" /* Table for af,sotype -> netid conversions. */ diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index b5782dc24e45..fc04961e6247 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -38,14 +38,13 @@ #include #include +#include #include #include #include #include #include -#include "mntopts.h" - static void usage(void) __dead2; static int diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c index 2805872d41ad..0425c6a1378c 100644 --- a/sbin/mount_udf/mount_udf.c +++ b/sbin/mount_udf/mount_udf.c @@ -53,14 +53,13 @@ #include #include +#include #include #include #include #include #include -#include "mntopts.h" - static struct mntopt mopts[] = { MOPT_STDOPTS, MOPT_UPDATE, diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c index 28f224ae0f68..d207e5581745 100644 --- a/sbin/mount_unionfs/mount_unionfs.c +++ b/sbin/mount_unionfs/mount_unionfs.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -49,8 +50,6 @@ #include #include -#include "mntopts.h" - static int subdir(const char *p, const char *dir) { diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc index a05760207648..4e5b047b78b7 100644 --- a/tests/sys/fs/fusefs/fallocate.cc +++ b/tests/sys/fs/fusefs/fallocate.cc @@ -32,10 +32,9 @@ extern "C" { #include #include +#include // for build_iovec #include #include - -#include "mntopts.h" // for build_iovec } #include "mockfs.hh" diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 35ae6c207229..b1621d05703c 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -39,13 +39,12 @@ extern "C" { #include #include +#include // for build_iovec #include #include #include #include #include - -#include "mntopts.h" // for build_iovec } #include diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc index 7a8d2c1396f0..ece518b09f66 100644 --- a/tests/sys/fs/fusefs/mount.cc +++ b/tests/sys/fs/fusefs/mount.cc @@ -33,7 +33,7 @@ extern "C" { #include #include -#include "mntopts.h" // for build_iovec +#include // for build_iovec } #include "mockfs.hh" diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index 32aa2300d094..5cd7106b1161 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -55,7 +56,6 @@ #include #include "common.h" -#include "mntopts.h" static int unmount_by_statfs(const struct statfs *sb, bool force) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 19d76b72da10..3c4e5e742c93 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -73,7 +74,6 @@ #include #include #include "pathnames.h" -#include "mntopts.h" #ifdef DEBUG #include