d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fusefs: remove the vfs.fusefs.mmap_enable sysctl

Browse Source 
This sysctl was added > 6.5 years ago for no clear reason.  Perhaps it was
intended to gate an unstable feature?  But now there's no reason to globally
disable mmap.  I'm not deleting the -ono_mmap mount option just yet, because
it might be useful as a workaround for bug 237588.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Alan Somers 2019-05-13 20:42:09 +00:00
parent 515183969d
commit fcefa6ef66
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UPDATING
View File

@ -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

3
sys/fs/fuse/fuse_ipc.h
View File

@ -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);
}

7
sys/fs/fuse/fuse_node.c
View File

@ -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)
{