svn commit: r347551 - in projects/fuse2: . sys/fs/fuse

[Alan Somers]

Author: asomers
Date: Mon May 13 20:42:09 2019
New Revision: 347551
URL: https://svnweb.freebsd.org/changeset/base/347551

Log:
  fusefs: remove the vfs.fusefs.mmap_enable sysctl
  
  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

Modified:
  projects/fuse2/UPDATING
  projects/fuse2/sys/fs/fuse/fuse_ipc.h
  projects/fuse2/sys/fs/fuse/fuse_node.c

Modified: projects/fuse2/UPDATING
==============================================================================
--- projects/fuse2/UPDATING	Mon May 13 20:31:10 2019	(r347550)
+++ projects/fuse2/UPDATING	Mon May 13 20:42:09 2019	(r347551)
@@ -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 at 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 at FreeBSD.org why.
 
 20190507:
 	The IPSEC option has been removed from GENERIC.  Users requiring

Modified: projects/fuse2/sys/fs/fuse/fuse_ipc.h
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_ipc.h	Mon May 13 20:31:10 2019	(r347550)
+++ projects/fuse2/sys/fs/fuse/fuse_ipc.h	Mon May 13 20:42:09 2019	(r347551)
@@ -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);
 }

Modified: projects/fuse2/sys/fs/fuse/fuse_node.c
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_node.c	Mon May 13 20:31:10 2019	(r347550)
+++ projects/fuse2/sys/fs/fuse/fuse_node.c	Mon May 13 20:42:09 2019	(r347551)
@@ -121,13 +121,6 @@ SYSCTL_INT(_vfs_fusefs, OID_AUTO, data_cache_invalidat
     "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)
 {