From 4d09e76a739dd349e36cb169ced8e19517bd122f Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Mon, 13 May 2019 19:47:31 +0000 Subject: [PATCH] fusefs: remove the vfs.fusefs.sync_resize syctl This sysctl was added > 6.5 years ago for no clear purpose. I'm guessing that it may have had something to do with the incomplete attribute cache. But the attribute cache works now. Since there's no clear motivation for this sysctl, it's best to remove it. Sponsored by: The FreeBSD Foundation --- UPDATING | 6 +++--- share/man/man5/fusefs.5 | 1 - sys/fs/fuse/fuse_io.c | 2 +- sys/fs/fuse/fuse_ipc.h | 1 - sys/fs/fuse/fuse_node.c | 7 ------- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/UPDATING b/UPDATING index 71a7de51c624..99914f3837a3 100644 --- a/UPDATING +++ b/UPDATING @@ -37,9 +37,9 @@ 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 sysctl has been removed. If you felt the - need to set it to a non-default value, please tell asomers@FreeBSD.org - why. + The vfs.fusefs.fix_broken_io and vfs.fusefs.sync_resize sysctls have + been removed. If you felt the need to set either 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/share/man/man5/fusefs.5 b/share/man/man5/fusefs.5 index bc4a8c3c5fe0..2d7c2e12881f 100644 --- a/share/man/man5/fusefs.5 +++ b/share/man/man5/fusefs.5 @@ -105,7 +105,6 @@ misbehaving. .\" vfs.fusefs.iov_credit: I don't understand it well enough .\" vfs.fusefs.iov_permanent_bufsize: I don't understand it well enough .\" vfs.fusefs.fix_broken_io: I don't understand it well enough -.\" vfs.fusefs.sync_resize: useless and should be removed .\" vfs.fusefs.refresh_size: probably useless? .\" vfs.fusefs.mmap_enable: why is this optional? .\" vfs.fusefs.data_cache_invalidate: what is this needed for? diff --git a/sys/fs/fuse/fuse_io.c b/sys/fs/fuse/fuse_io.c index 9b7b152cc596..72532daa0602 100644 --- a/sys/fs/fuse/fuse_io.c +++ b/sys/fs/fuse/fuse_io.c @@ -709,7 +709,7 @@ fuse_write_biobackend(struct vnode *vp, struct uio *uio, break; } while (uio->uio_resid > 0 && n > 0); - if (fuse_sync_resize && (fvdat->flag & FN_SIZECHANGE) != 0) + if ((fvdat->flag & FN_SIZECHANGE) != 0) fuse_vnode_savesize(vp, cred, pid); return (err); diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index a288acc4584b..73401ba8069b 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -231,7 +231,6 @@ enum fuse_data_cache_mode { extern int fuse_data_cache_mode; extern int fuse_data_cache_invalidate; extern int fuse_mmap_enable; -extern int fuse_sync_resize; 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 8bf5693d6480..bc2c8f43101b 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -135,13 +135,6 @@ SYSCTL_INT(_vfs_fusefs, OID_AUTO, refresh_size, CTLFLAG_RW, "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_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"); - static int sysctl_fuse_cache_mode(SYSCTL_HANDLER_ARGS) {