From 07c1791e9ed83f74bd1375f0b15274d898a8c9b9 Mon Sep 17 00:00:00 2001 From: Jorgen Lundman Date: Thu, 25 Apr 2024 14:23:42 +0900 Subject: [PATCH] Restore global mntent.h We accidentally broke Linux build by modifying the global header, instead of the Windows specific header. Signed-off-by: Jorgen Lundman --- include/sys/mntent.h | 4 ++++ lib/libspl/include/os/windows/mntent.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sys/mntent.h b/include/sys/mntent.h index b47bab09a8e3..6685e6ccfae6 100644 --- a/include/sys/mntent.h +++ b/include/sys/mntent.h @@ -53,6 +53,8 @@ #define MNTOPT_DEFCONTEXT "defcontext" /* selinux defcontext */ #define MNTOPT_ROOTCONTEXT "rootcontext" /* selinux rootcontext */ #define MNTOPT_DEFAULTS "defaults" /* defaults */ +#define MNTOPT_DEVICES "dev" /* device-special allowed */ +#define MNTOPT_NODEVICES "nodev" /* device-special disallowed */ #define MNTOPT_DIRATIME "diratime" /* update atime for dirs */ #define MNTOPT_NODIRATIME "nodiratime" /* do not update atime for dirs */ #define MNTOPT_DIRSYNC "dirsync" /* do dir updates synchronously */ @@ -62,6 +64,8 @@ #define MNTOPT_NOGROUP "nogroup" /* do not allow group mount */ #define MNTOPT_IVERSION "iversion" /* update inode version */ #define MNTOPT_NOIVERSION "noiversion" /* do not update inode version */ +#define MNTOPT_NBMAND "mand" /* allow non-blocking mandatory locks */ +#define MNTOPT_NONBMAND "nomand" /* deny non-blocking mandatory locks */ #define MNTOPT_NETDEV "_netdev" /* network device */ #define MNTOPT_NOFAIL "nofail" /* no failure */ #define MNTOPT_RELATIME "relatime" /* allow relative time updates */ diff --git a/lib/libspl/include/os/windows/mntent.h b/lib/libspl/include/os/windows/mntent.h index 69220538a986..f71ea207af32 100644 --- a/lib/libspl/include/os/windows/mntent.h +++ b/lib/libspl/include/os/windows/mntent.h @@ -71,8 +71,6 @@ extern "C" { #define MNTOPT_HARD "hard" /* Hard mount */ #define MNTOPT_SUID "suid" /* Both setuid and devices allowed */ #define MNTOPT_NOSUID "nosuid" /* Neither setuid nor devices allowed */ -#define MNTOPT_DEVICES "devices" /* Device-special allowed */ -#define MNTOPT_NODEVICES "nodevices" /* Device-special disallowed */ #define MNTOPT_SETUID "setuid" /* Set uid allowed */ #define MNTOPT_NOSETUID "nosetuid" /* Set uid not allowed */ #define MNTOPT_GRPID "grpid" /* SysV-compatible gid on create */ @@ -124,8 +122,6 @@ extern "C" { #define MNTOPT_NOGLOBAL "noglobal" /* Mount local to single node */ #define MNTOPT_DFRATIME "dfratime" /* Deferred access time updates */ #define MNTOPT_NODFRATIME "nodfratime" /* No Deferred access time updates */ -#define MNTOPT_NBMAND "nbmand" /* allow non-blocking mandatory locks */ -#define MNTOPT_NONBMAND "nonbmand" /* deny non-blocking mandatory locks */ #define MNTOPT_XATTR "xattr" /* enable extended attributes */ #define MNTOPT_NOXATTR "noxattr" /* disable extended attributes */ #define MNTOPT_EXEC "exec" /* enable executables */