svn commit: r351940 - in stable/12: . lib/libjail sbin/mount_fusefs sys/conf sys/fs/fuse sys/modules sys/modules/em sys/modules/fuse sys/modules/fusefs sys/modules/iavf
Alan Somers
asomers at FreeBSD.org
Fri Sep 6 17:21:25 UTC 2019
Author: asomers
Date: Fri Sep 6 17:21:21 2019
New Revision: 351940
URL: https://svnweb.freebsd.org/changeset/base/351940
Log:
MFC r345350, r346441, r346765
r345350:
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
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D19649
r346441:
Use symlinks for kernel modules rather than hardlinks
When aliasing a kernel module to a different name (ie if_igb for if_em),
it's better to use symlinks than hard links. kldxref will omit entries for
the links, ensuring that the loaded module has the correct name.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D19979
r346765:
Don't symlink fusefs.ko to fuse.ko on PPC
Some PPC systems (PowerNV) use msdosfs for /boot, which can't handle either
symlinks or hardlinks. So on PPC, copy the module instead. This change fixes
installkernel on such systems after r345350.
Reported by: Brandon Bergren <git_bdragon.rtk0.net>
Reviewed by: jhibbits, rgrimes
MFC-With: 345350, 346441
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D19993
Added:
stable/12/sys/modules/fusefs/
- copied from r345350, head/sys/modules/fusefs/
Deleted:
stable/12/sys/modules/fuse/
Modified:
stable/12/UPDATING
stable/12/lib/libjail/jail.c
stable/12/sbin/mount_fusefs/mount_fusefs.c
stable/12/sys/conf/NOTES
stable/12/sys/conf/files
stable/12/sys/conf/options
stable/12/sys/fs/fuse/fuse.h
stable/12/sys/fs/fuse/fuse_file.c
stable/12/sys/fs/fuse/fuse_ipc.c
stable/12/sys/fs/fuse/fuse_main.c
stable/12/sys/fs/fuse/fuse_node.c
stable/12/sys/fs/fuse/fuse_vfsops.c
stable/12/sys/fs/fuse/fuse_vnops.c
stable/12/sys/modules/Makefile
stable/12/sys/modules/em/Makefile
stable/12/sys/modules/fusefs/Makefile
stable/12/sys/modules/iavf/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/UPDATING
==============================================================================
--- stable/12/UPDATING Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/UPDATING Fri Sep 6 17:21:21 2019 (r351940)
@@ -16,6 +16,12 @@ from older versions of FreeBSD, try WITHOUT_CLANG and
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
+20190906:
+ 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.
+
20190811:
Default permissions on the /var/account/acct file (and copies of it
rotated by periodic daily scripts) are changed from 0644 to 0640
Modified: stable/12/lib/libjail/jail.c
==============================================================================
--- stable/12/lib/libjail/jail.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/lib/libjail/jail.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -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: stable/12/sbin/mount_fusefs/mount_fusefs.c
==============================================================================
--- stable/12/sbin/mount_fusefs/mount_fusefs.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sbin/mount_fusefs/mount_fusefs.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -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: stable/12/sys/conf/NOTES
==============================================================================
--- stable/12/sys/conf/NOTES Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/conf/NOTES Fri Sep 6 17:21:21 2019 (r351940)
@@ -1073,7 +1073,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: stable/12/sys/conf/files
==============================================================================
--- stable/12/sys/conf/files Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/conf/files Fri Sep 6 17:21:21 2019 (r351940)
@@ -3568,15 +3568,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: stable/12/sys/conf/options
==============================================================================
--- stable/12/sys/conf/options Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/conf/options Fri Sep 6 17:21:21 2019 (r351940)
@@ -249,7 +249,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: stable/12/sys/fs/fuse/fuse.h
==============================================================================
--- stable/12/sys/fs/fuse/fuse.h Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse.h Fri Sep 6 17:21:21 2019 (r351940)
@@ -143,7 +143,7 @@
/* misc */
-SYSCTL_DECL(_vfs_fuse);
+SYSCTL_DECL(_vfs_fusefs);
/* Fuse locking */
Modified: stable/12/sys/fs/fuse/fuse_file.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_file.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse_file.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -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, "");
int
Modified: stable/12/sys/fs/fuse/fuse_ipc.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_ipc.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse_ipc.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -107,21 +107,21 @@ fuse_setup_ihead(struct fuse_in_header *ihead,
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: stable/12/sys/fs/fuse/fuse_main.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_main.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse_main.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -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");
/******************************
@@ -155,10 +155,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: stable/12/sys/fs/fuse/fuse_node.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_node.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse_node.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -96,46 +96,46 @@ MALLOC_DEFINE(M_FUSEVN, "fuse_vnode", "fuse vnode priv
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_enable = 1;
-SYSCTL_INT(_vfs_fuse, OID_AUTO, data_cache_enable, CTLFLAG_RW,
+SYSCTL_INT(_vfs_fusefs, OID_AUTO, data_cache_enable, CTLFLAG_RW,
&fuse_data_cache_enable, 0,
"enable caching of FUSE file data (including dirty data)");
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_enable 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: stable/12/sys/fs/fuse/fuse_vfsops.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_vfsops.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse_vfsops.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -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: stable/12/sys/fs/fuse/fuse_vnops.c
==============================================================================
--- stable/12/sys/fs/fuse/fuse_vnops.c Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/fs/fuse/fuse_vnops.c Fri Sep 6 17:21:21 2019 (r351940)
@@ -180,17 +180,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, "");
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, "");
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, "");
/*
@@ -199,7 +199,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, "");
int fuse_pbuf_freecnt = -1;
Modified: stable/12/sys/modules/Makefile
==============================================================================
--- stable/12/sys/modules/Makefile Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/modules/Makefile Fri Sep 6 17:21:21 2019 (r351940)
@@ -135,7 +135,7 @@ SUBDIR= \
filemon \
firewire \
firmware \
- fuse \
+ fusefs \
${_fxp} \
gem \
geom \
Modified: stable/12/sys/modules/em/Makefile
==============================================================================
--- stable/12/sys/modules/em/Makefile Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/modules/em/Makefile Fri Sep 6 17:21:21 2019 (r351940)
@@ -22,6 +22,6 @@ CFLAGS += -I${SRCTOP}/sys/dev/e1000
# DEVICE_POLLING for a non-interrupt-driven method
#CFLAGS += -DDEVICE_POLLING
-LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_igb.ko
+SYMLINKS= ${KMOD}.ko ${KMODDIR}/if_igb.ko
.include <bsd.kmod.mk>
Modified: stable/12/sys/modules/fusefs/Makefile
==============================================================================
--- head/sys/modules/fusefs/Makefile Wed Mar 20 21:48:43 2019 (r345350)
+++ stable/12/sys/modules/fusefs/Makefile Fri Sep 6 17:21:21 2019 (r351940)
@@ -8,6 +8,22 @@ SRCS= vnode_if.h \
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
+.if ${MACHINE_CPUARCH} != "powerpc"
+SYMLINKS= ${KMOD}.ko ${KMODDIR}/fuse.ko
+.else
+# Some PPC systems use msdosfs for /boot, which can't handle links or symlinks
+afterinstall: alias alias_debug
+alias: .PHONY
+ ${INSTALL} -T release -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/fuse.ko
+.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && "${MK_KERNEL_SYMBOLS}" != "no"
+alias_debug: .PHONY
+ ${INSTALL} -T debug -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
+ ${_INSTALLFLAGS} ${PROG}.debug \
+ ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/fuse.ko
+.else
+alias_debug: .PHONY
+.endif
+.endif
.include <bsd.kmod.mk>
Modified: stable/12/sys/modules/iavf/Makefile
==============================================================================
--- stable/12/sys/modules/iavf/Makefile Fri Sep 6 17:06:48 2019 (r351939)
+++ stable/12/sys/modules/iavf/Makefile Fri Sep 6 17:21:21 2019 (r351940)
@@ -15,6 +15,6 @@ SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c
# Enable asserts and other debugging facilities
# CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS
-LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko
+SYMLINKS= ${KMOD}.ko ${KMODDIR}/if_ixlv.ko
.include <bsd.kmod.mk>
More information about the svn-src-all
mailing list