diff options
| -rw-r--r-- | UPDATING | 8 | ||||
| -rw-r--r-- | sys/fs/fuse/fuse_ipc.h | 3 | ||||
| -rw-r--r-- | sys/fs/fuse/fuse_node.c | 7 |
3 files changed, 5 insertions, 13 deletions
diff --git a/UPDATING b/UPDATING index f2e41bd728055..90e3296b4e47d 100644 --- a/UPDATING +++ b/UPDATING @@ -37,10 +37,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: been removed from mount_fusefs(8). You can safely remove them from your scripts, because they had no effect. - The vfs.fusefs.fix_broken_io, vfs.fusefs.sync_resize, and - vfs.fusefs.refresh_size sysctls have been removed. If you felt the - need to set any of them to a non-default value, please tell - asomers@FreeBSD.org why. + The vfs.fusefs.fix_broken_io, vfs.fusefs.sync_resize, + vfs.fusefs.refresh_size, and vfs.fusefs.mmap_enable sysctls have been + removed. If you felt the need to set any of them to a non-default + value, please tell asomers@FreeBSD.org why. 20190507: The IPSEC option has been removed from GENERIC. Users requiring diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index 73401ba8069b4..eb274a0bbb3ed 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -230,7 +230,6 @@ enum fuse_data_cache_mode { extern int fuse_data_cache_mode; extern int fuse_data_cache_invalidate; -extern int fuse_mmap_enable; static inline struct fuse_data * fuse_get_mpdata(struct mount *mp) @@ -268,7 +267,7 @@ fsess_opt_mmap(struct mount *mp) { struct fuse_data *data = fuse_get_mpdata(mp); - if (!fuse_mmap_enable || fuse_data_cache_mode == FUSE_CACHE_UC) + if (fuse_data_cache_mode == FUSE_CACHE_UC) return (false); return ((data->dataflags & (FSESS_NO_DATACACHE | FSESS_NO_MMAP)) == 0); } diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index eefc0cac37669..c1e5087c9cda5 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -121,13 +121,6 @@ SYSCTL_INT(_vfs_fusefs, OID_AUTO, data_cache_invalidate, CTLFLAG_RW, "If non-zero, discard cached clean file data when there are no active file" " users"); -int fuse_mmap_enable = 1; - -SYSCTL_INT(_vfs_fusefs, OID_AUTO, mmap_enable, CTLFLAG_RW, - &fuse_mmap_enable, 0, - "If non-zero, and data_cache_mode is also non-zero, enable mmap(2) of " - "FUSE files"); - static int sysctl_fuse_cache_mode(SYSCTL_HANDLER_ARGS) { |