diff --git a/UPDATING b/UPDATING index 90e3296b4e47..d73a26860203 100644 --- a/UPDATING +++ b/UPDATING @@ -38,9 +38,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: your scripts, because they had no effect. 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. + vfs.fusefs.refresh_size, vfs.fusefs.mmap_enable, and + vfs.fusefs.data_cache_invalidate 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 eb274a0bbb3e..405193b7a950 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -229,7 +229,6 @@ enum fuse_data_cache_mode { }; extern int fuse_data_cache_mode; -extern int fuse_data_cache_invalidate; static inline struct fuse_data * fuse_get_mpdata(struct mount *mp) diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index c1e5087c9cda..2c6fe6f86ce6 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -114,13 +114,6 @@ SYSCTL_PROC(_vfs_fusefs, OID_AUTO, data_cache_mode, CTLTYPE_INT|CTLFLAG_RW, "Zero: disable caching of FUSE file data; One: write-through caching " "(default); Two: write-back caching (generally unsafe)"); -int fuse_data_cache_invalidate = 0; - -SYSCTL_INT(_vfs_fusefs, OID_AUTO, data_cache_invalidate, CTLFLAG_RW, - &fuse_data_cache_invalidate, 0, - "If non-zero, discard cached clean file data when there are no active file" - " users"); - static int sysctl_fuse_cache_mode(SYSCTL_HANDLER_ARGS) { diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 10afbc0f1675..9ac1c2d93860 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -762,8 +762,7 @@ fuse_vnop_inactive(struct vop_inactive_args *ap) if ((VTOFUD(vp)->flag & FN_SIZECHANGE) != 0) { fuse_vnode_savesize(vp, NULL, 0); } - if (fuse_data_cache_invalidate || - (fvdat->flag & FN_REVOKED) != 0) + if ((fvdat->flag & FN_REVOKED) != 0) fuse_io_invalbuf(vp, td); else fuse_io_flushbuf(vp, MNT_WAIT, td);