From owner-svn-src-head@freebsd.org Wed Mar 20 21:48:48 2019 Return-Path: Delivered-To: svn-src-head@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 4DB331538C26; Wed, 20 Mar 2019 21:48:48 +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 B249C82E81; Wed, 20 Mar 2019 21:48:47 +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 78FEE26B08; Wed, 20 Mar 2019 21:48:47 +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 x2KLmlCu059300; Wed, 20 Mar 2019 21:48:47 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2KLmiJr059285; Wed, 20 Mar 2019 21:48:44 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201903202148.x2KLmiJr059285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 20 Mar 2019 21:48:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345350 - in head: . lib/libjail sbin/mount_fusefs sys/conf sys/fs/fuse sys/modules sys/modules/fuse sys/modules/fusefs X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head: . lib/libjail sbin/mount_fusefs sys/conf sys/fs/fuse sys/modules sys/modules/fuse sys/modules/fusefs X-SVN-Commit-Revision: 345350 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B249C82E81 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2019 21:48:48 -0000 Author: asomers Date: Wed Mar 20 21:48:43 2019 New Revision: 345350 URL: https://svnweb.freebsd.org/changeset/base/345350 Log: Rename fuse(4) to fusefs(4) This makes it more consistent with other filesystems, which all end in "fs", and more consistent with its mount helper, which is already named "mount_fusefs". Reviewed by: cem, rgrimes MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19649 Added: head/sys/modules/fusefs/ - copied from r345349, head/sys/modules/fuse/ Deleted: head/sys/modules/fuse/ Modified: head/UPDATING head/lib/libjail/jail.c head/sbin/mount_fusefs/mount_fusefs.c head/sys/conf/NOTES head/sys/conf/files head/sys/conf/options head/sys/fs/fuse/fuse.h head/sys/fs/fuse/fuse_file.c head/sys/fs/fuse/fuse_ipc.c head/sys/fs/fuse/fuse_main.c head/sys/fs/fuse/fuse_node.c head/sys/fs/fuse/fuse_vfsops.c head/sys/fs/fuse/fuse_vnops.c head/sys/modules/Makefile head/sys/modules/fusefs/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Mar 20 20:57:11 2019 (r345349) +++ head/UPDATING Wed Mar 20 21:48:43 2019 (r345350) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20190320: + The fuse(4) module has been renamed to fusefs(4) for consistency with + other filesystems. You should update any kld_load="fuse" entries in + /etc/rc.conf, fuse_load="YES" entries in /boot/loader.conf, and + "options FUSE" enties in kernel config files. + 20190304: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to 8.0.0. Please see the 20141231 entry below for information about Modified: head/lib/libjail/jail.c ============================================================================== --- head/lib/libjail/jail.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/lib/libjail/jail.c Wed Mar 20 21:48:43 2019 (r345350) @@ -1050,14 +1050,8 @@ kldload_param(const char *name) kl = kldload(name); else if (strncmp(name, "allow.mount.", 12) == 0) { /* Load the matching filesystem */ - const char *modname; + const char *modname = name + 12; - if (strcmp("fusefs", name + 12) == 0 || - strcmp("nofusefs", name + 12) == 0) { - modname = "fuse"; - } else { - modname = name + 12; - } kl = kldload(modname); if (kl < 0 && errno == ENOENT && strncmp(modname, "no", 2) == 0) Modified: head/sbin/mount_fusefs/mount_fusefs.c ============================================================================== --- head/sbin/mount_fusefs/mount_fusefs.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sbin/mount_fusefs/mount_fusefs.c Wed Mar 20 21:48:43 2019 (r345350) @@ -501,7 +501,7 @@ init_backgrounded(void) len = sizeof(ibg); - if (sysctlbyname("vfs.fuse.init_backgrounded", &ibg, &len, NULL, 0)) + if (sysctlbyname("vfs.fusefs.init_backgrounded", &ibg, &len, NULL, 0)) return (0); return (ibg); Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/conf/NOTES Wed Mar 20 21:48:43 2019 (r345350) @@ -1071,7 +1071,7 @@ options NFSCL #Network File System client options AUTOFS #Automounter filesystem options CD9660 #ISO 9660 filesystem options FDESCFS #File descriptor filesystem -options FUSE #FUSE support module +options FUSEFS #FUSEFS support module options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSLOCKD #Network Lock Manager options NFSD #Network Filesystem Server Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/conf/files Wed Mar 20 21:48:43 2019 (r345350) @@ -3494,15 +3494,15 @@ fs/fdescfs/fdesc_vfsops.c optional fdescfs fs/fdescfs/fdesc_vnops.c optional fdescfs fs/fifofs/fifo_vnops.c standard fs/cuse/cuse.c optional cuse -fs/fuse/fuse_device.c optional fuse -fs/fuse/fuse_file.c optional fuse -fs/fuse/fuse_internal.c optional fuse -fs/fuse/fuse_io.c optional fuse -fs/fuse/fuse_ipc.c optional fuse -fs/fuse/fuse_main.c optional fuse -fs/fuse/fuse_node.c optional fuse -fs/fuse/fuse_vfsops.c optional fuse -fs/fuse/fuse_vnops.c optional fuse +fs/fuse/fuse_device.c optional fusefs +fs/fuse/fuse_file.c optional fusefs +fs/fuse/fuse_internal.c optional fusefs +fs/fuse/fuse_io.c optional fusefs +fs/fuse/fuse_ipc.c optional fusefs +fs/fuse/fuse_main.c optional fusefs +fs/fuse/fuse_node.c optional fusefs +fs/fuse/fuse_vfsops.c optional fusefs +fs/fuse/fuse_vnops.c optional fusefs fs/msdosfs/msdosfs_conv.c optional msdosfs fs/msdosfs/msdosfs_denode.c optional msdosfs fs/msdosfs/msdosfs_fat.c optional msdosfs Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/conf/options Wed Mar 20 21:48:43 2019 (r345350) @@ -253,7 +253,7 @@ CD9660 opt_dontuse.h EXT2FS opt_dontuse.h FDESCFS opt_dontuse.h FFS opt_dontuse.h -FUSE opt_dontuse.h +FUSEFS opt_dontuse.h MSDOSFS opt_dontuse.h NANDFS opt_dontuse.h NULLFS opt_dontuse.h Modified: head/sys/fs/fuse/fuse.h ============================================================================== --- head/sys/fs/fuse/fuse.h Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse.h Wed Mar 20 21:48:43 2019 (r345350) @@ -143,7 +143,7 @@ /* misc */ -SYSCTL_DECL(_vfs_fuse); +SYSCTL_DECL(_vfs_fusefs); /* Fuse locking */ Modified: head/sys/fs/fuse/fuse_file.c ============================================================================== --- head/sys/fs/fuse/fuse_file.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse_file.c Wed Mar 20 21:48:43 2019 (r345350) @@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$"); static int fuse_fh_count = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, filehandle_count, CTLFLAG_RD, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, filehandle_count, CTLFLAG_RD, &fuse_fh_count, 0, "number of open FUSE filehandles"); int Modified: head/sys/fs/fuse/fuse_ipc.c ============================================================================== --- head/sys/fs/fuse/fuse_ipc.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse_ipc.c Wed Mar 20 21:48:43 2019 (r345350) @@ -99,21 +99,21 @@ static int fuse_body_audit(struct fuse_ticket *ftick, static fuse_handler_t fuse_standard_handler; -SYSCTL_NODE(_vfs, OID_AUTO, fuse, CTLFLAG_RW, 0, "FUSE tunables"); -SYSCTL_STRING(_vfs_fuse, OID_AUTO, version, CTLFLAG_RD, +SYSCTL_NODE(_vfs, OID_AUTO, fusefs, CTLFLAG_RW, 0, "FUSE tunables"); +SYSCTL_STRING(_vfs_fusefs, OID_AUTO, version, CTLFLAG_RD, FUSE_FREEBSD_VERSION, 0, "fuse-freebsd version"); static int fuse_ticket_count = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, ticket_count, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, ticket_count, CTLFLAG_RW, &fuse_ticket_count, 0, "number of allocated tickets"); static long fuse_iov_permanent_bufsize = 1 << 19; -SYSCTL_LONG(_vfs_fuse, OID_AUTO, iov_permanent_bufsize, CTLFLAG_RW, +SYSCTL_LONG(_vfs_fusefs, OID_AUTO, iov_permanent_bufsize, CTLFLAG_RW, &fuse_iov_permanent_bufsize, 0, "limit for permanently stored buffer size for fuse_iovs"); static int fuse_iov_credit = 16; -SYSCTL_INT(_vfs_fuse, OID_AUTO, iov_credit, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, iov_credit, CTLFLAG_RW, &fuse_iov_credit, 0, "how many times is an oversized fuse_iov tolerated"); Modified: head/sys/fs/fuse/fuse_main.c ============================================================================== --- head/sys/fs/fuse/fuse_main.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse_main.c Wed Mar 20 21:48:43 2019 (r345350) @@ -94,9 +94,9 @@ static struct vfsconf fuse_vfsconf = { .vfc_flags = VFCF_JAIL | VFCF_SYNTHETIC }; -SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, kernelabi_major, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, FUSE_KERNEL_VERSION, "FUSE kernel abi major version"); -SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, kernelabi_minor, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version"); /****************************** @@ -156,10 +156,10 @@ fuse_loader(struct module *m, int what, void *arg) /* Registering the module */ static moduledata_t fuse_moddata = { - "fuse", + "fusefs", fuse_loader, &fuse_vfsconf }; -DECLARE_MODULE(fuse, fuse_moddata, SI_SUB_VFS, SI_ORDER_MIDDLE); -MODULE_VERSION(fuse, 1); +DECLARE_MODULE(fusefs, fuse_moddata, SI_SUB_VFS, SI_ORDER_MIDDLE); +MODULE_VERSION(fusefs, 1); Modified: head/sys/fs/fuse/fuse_node.c ============================================================================== --- head/sys/fs/fuse/fuse_node.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse_node.c Wed Mar 20 21:48:43 2019 (r345350) @@ -98,47 +98,47 @@ static int sysctl_fuse_cache_mode(SYSCTL_HANDLER_ARGS) static int fuse_node_count = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, node_count, CTLFLAG_RD, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, node_count, CTLFLAG_RD, &fuse_node_count, 0, "Count of FUSE vnodes"); int fuse_data_cache_mode = FUSE_CACHE_WT; -SYSCTL_PROC(_vfs_fuse, OID_AUTO, data_cache_mode, CTLTYPE_INT|CTLFLAG_RW, +SYSCTL_PROC(_vfs_fusefs, OID_AUTO, data_cache_mode, CTLTYPE_INT|CTLFLAG_RW, &fuse_data_cache_mode, 0, sysctl_fuse_cache_mode, "I", "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_fuse, OID_AUTO, data_cache_invalidate, CTLFLAG_RW, +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"); int fuse_mmap_enable = 1; -SYSCTL_INT(_vfs_fuse, OID_AUTO, mmap_enable, CTLFLAG_RW, +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"); int fuse_refresh_size = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, refresh_size, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, refresh_size, CTLFLAG_RW, &fuse_refresh_size, 0, "If non-zero, and no dirty file extension data is buffered, fetch file " "size before write operations"); int fuse_sync_resize = 1; -SYSCTL_INT(_vfs_fuse, OID_AUTO, sync_resize, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, sync_resize, CTLFLAG_RW, &fuse_sync_resize, 0, "If a cached write extended a file, inform FUSE filesystem of the changed" "size immediately subsequent to the issued writes"); int fuse_fix_broken_io = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, fix_broken_io, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, fix_broken_io, CTLFLAG_RW, &fuse_fix_broken_io, 0, "If non-zero, print a diagnostic warning if a userspace filesystem returns" " EIO on reads of recently extended portions of files"); Modified: head/sys/fs/fuse/fuse_vfsops.c ============================================================================== --- head/sys/fs/fuse/fuse_vfsops.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse_vfsops.c Wed Mar 20 21:48:43 2019 (r345350) @@ -115,16 +115,16 @@ struct vfsops fuse_vfsops = { .vfs_statfs = fuse_vfsop_statfs, }; -SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, init_backgrounded, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, 1, "indicate async handshake"); static int fuse_enforce_dev_perms = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, &fuse_enforce_dev_perms, 0, "enforce fuse device permissions for secondary mounts"); static unsigned sync_unmount = 1; -SYSCTL_UINT(_vfs_fuse, OID_AUTO, sync_unmount, CTLFLAG_RW, +SYSCTL_UINT(_vfs_fusefs, OID_AUTO, sync_unmount, CTLFLAG_RW, &sync_unmount, 0, "specify when to use synchronous unmount"); MALLOC_DEFINE(M_FUSEVFS, "fuse_filesystem", "buffer for fuse vfs layer"); Modified: head/sys/fs/fuse/fuse_vnops.c ============================================================================== --- head/sys/fs/fuse/fuse_vnops.c Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/fs/fuse/fuse_vnops.c Wed Mar 20 21:48:43 2019 (r345350) @@ -179,17 +179,17 @@ struct vop_vector fuse_vnops = { static u_long fuse_lookup_cache_hits = 0; -SYSCTL_ULONG(_vfs_fuse, OID_AUTO, lookup_cache_hits, CTLFLAG_RD, +SYSCTL_ULONG(_vfs_fusefs, OID_AUTO, lookup_cache_hits, CTLFLAG_RD, &fuse_lookup_cache_hits, 0, "number of positive cache hits in lookup"); static u_long fuse_lookup_cache_misses = 0; -SYSCTL_ULONG(_vfs_fuse, OID_AUTO, lookup_cache_misses, CTLFLAG_RD, +SYSCTL_ULONG(_vfs_fusefs, OID_AUTO, lookup_cache_misses, CTLFLAG_RD, &fuse_lookup_cache_misses, 0, "number of cache misses in lookup"); int fuse_lookup_cache_enable = 1; -SYSCTL_INT(_vfs_fuse, OID_AUTO, lookup_cache_enable, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, lookup_cache_enable, CTLFLAG_RW, &fuse_lookup_cache_enable, 0, "if non-zero, enable lookup cache"); /* @@ -198,7 +198,7 @@ SYSCTL_INT(_vfs_fuse, OID_AUTO, lookup_cache_enable, C */ static int fuse_reclaim_revoked = 0; -SYSCTL_INT(_vfs_fuse, OID_AUTO, reclaim_revoked, CTLFLAG_RW, +SYSCTL_INT(_vfs_fusefs, OID_AUTO, reclaim_revoked, CTLFLAG_RW, &fuse_reclaim_revoked, 0, ""); uma_zone_t fuse_pbuf_zone; Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/modules/Makefile Wed Mar 20 21:48:43 2019 (r345350) @@ -129,7 +129,7 @@ SUBDIR= \ filemon \ firewire \ firmware \ - fuse \ + fusefs \ ${_fxp} \ gem \ geom \ Modified: head/sys/modules/fusefs/Makefile ============================================================================== --- head/sys/modules/fuse/Makefile Wed Mar 20 20:57:11 2019 (r345349) +++ head/sys/modules/fusefs/Makefile Wed Mar 20 21:48:43 2019 (r345350) @@ -2,9 +2,12 @@ .PATH: ${SRCTOP}/sys/fs/fuse -KMOD= fuse +KMOD= fusefs SRCS= vnode_if.h \ fuse_node.c fuse_io.c fuse_device.c fuse_ipc.c fuse_file.c \ fuse_vfsops.c fuse_vnops.c fuse_internal.c fuse_main.c + +# Symlink for backwards compatibility with systems installed at 12.0 or older +LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/fuse.ko .include