diff options
| author | Rick Macklem <rmacklem@FreeBSD.org> | 2026-07-13 02:59:26 +0000 |
|---|---|---|
| committer | Rick Macklem <rmacklem@FreeBSD.org> | 2026-07-13 02:59:26 +0000 |
| commit | 88711f144170df4e8a4f3359c9e6089dad836951 (patch) | |
| tree | c45561f834d64b98064842ae51609deb7ca4d6b2 | |
| parent | c3f6c655dd155f4c84ce743c86e07d9f0b6b348a (diff) | |
Revert "chflags: Add a new UF_DONTCACHE flag"
This reverts commit 74654ba3b1b3bcf6ba8870a54310accbb6adbf0b.
Apparently it breaks cross building from Linux for some
reason. I'll admit I didn't even know we supported cross
building from Linux.
| -rw-r--r-- | lib/libc/gen/strtofflags.c | 4 | ||||
| -rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 2 | ||||
| -rw-r--r-- | sys/sys/stat.h | 1 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c index ca12401c37e5..73b4db54ccdd 100644 --- a/lib/libc/gen/strtofflags.c +++ b/lib/libc/gen/strtofflags.c @@ -80,9 +80,7 @@ static struct { { "nosparse", 0, UF_SPARSE }, { "nousparse", 0, UF_SPARSE }, { "nosystem", 0, UF_SYSTEM }, - { "nousystem", 0, UF_SYSTEM }, - { "nodontcache", 0, UF_DONTCACHE }, - { "noudontcache", 0, UF_DONTCACHE } + { "nousystem", 0, UF_SYSTEM } }; #define nmappings (sizeof(mapping) / sizeof(mapping[0])) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index c9a9a3114fb3..dd281d18d87d 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -2042,7 +2042,7 @@ tmpfs_chflags(struct vnode *vp, u_long flags, struct ucred *cred, if ((flags & ~(SF_APPEND | SF_ARCHIVED | SF_IMMUTABLE | SF_NOUNLINK | UF_APPEND | UF_ARCHIVE | UF_HIDDEN | UF_IMMUTABLE | UF_NODUMP | UF_NOUNLINK | UF_OFFLINE | UF_OPAQUE | UF_READONLY | UF_REPARSE | - UF_SPARSE | UF_SYSTEM | UF_DONTCACHE)) != 0) + UF_SPARSE | UF_SYSTEM)) != 0) return (EOPNOTSUPP); /* Disallow this operation if the file system is mounted read-only. */ diff --git a/sys/sys/stat.h b/sys/sys/stat.h index 457ec99365d2..0c58838094ed 100644 --- a/sys/sys/stat.h +++ b/sys/sys/stat.h @@ -327,7 +327,6 @@ struct nstat { #define UF_REPARSE 0x00000400 /* Windows reparse point file bit */ #define UF_ARCHIVE 0x00000800 /* file needs to be archived */ #define UF_READONLY 0x00001000 /* Windows readonly file bit */ -#define UF_DONTCACHE 0x00002000 /* don't cache file data (NFSv4) */ /* This is the same as the MacOS X definition of UF_HIDDEN. */ #define UF_HIDDEN 0x00008000 /* file is hidden */ diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 762b5bb5b5ec..1d04e1b2785f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -667,7 +667,7 @@ ufs_setattr( SF_NOUNLINK | SF_SNAPSHOT | UF_APPEND | UF_ARCHIVE | UF_HIDDEN | UF_IMMUTABLE | UF_NODUMP | UF_NOUNLINK | UF_OFFLINE | UF_OPAQUE | UF_READONLY | UF_REPARSE | - UF_SPARSE | UF_SYSTEM | UF_DONTCACHE)) != 0) + UF_SPARSE | UF_SYSTEM)) != 0) return (EOPNOTSUPP); if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); |