From owner-svn-src-projects@freebsd.org Mon May 13 20:42:11 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8D88159AC4E for ; Mon, 13 May 2019 20:42:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6F2246D624; Mon, 13 May 2019 20:42:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32C4BF153; Mon, 13 May 2019 20:42:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4DKgAOa016047; Mon, 13 May 2019 20:42:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4DKg9DC016045; Mon, 13 May 2019 20:42:09 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201905132042.x4DKg9DC016045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 13 May 2019 20:42:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r347551 - in projects/fuse2: . sys/fs/fuse X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: . sys/fs/fuse X-SVN-Commit-Revision: 347551 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6F2246D624 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2019 20:42:11 -0000 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@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 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) {