From f4c095459b4f41d29827c1a613ecb2f7eb7c75c0 Mon Sep 17 00:00:00 2001 From: mvs Date: Mon, 20 May 2024 09:11:21 +0000 Subject: [PATCH] Drop MNT_LOCAL flag in corresponding `vfsconflist' fuse(4) entry instead of cleaning it in fusefs_mount(). ok claudio --- sys/kern/vfs_init.c | 4 ++-- sys/miscfs/fuse/fuse_vfsops.c | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 84c00f0e444..8d31047ac94 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_init.c,v 1.43 2019/12/26 13:30:54 bluhm Exp $ */ +/* $OpenBSD: vfs_init.c,v 1.44 2024/05/20 09:11:21 mvs Exp $ */ /* $NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $ */ /* @@ -92,7 +92,7 @@ static struct vfsconf vfsconflist[] = { #endif #ifdef FUSE - { &fusefs_vfsops, MOUNT_FUSEFS, 18, 0, MNT_LOCAL, + { &fusefs_vfsops, MOUNT_FUSEFS, 18, 0, 0, sizeof(struct fusefs_args) }, #endif diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c index c848894b3be..4a2a7a3110b 100644 --- a/sys/miscfs/fuse/fuse_vfsops.c +++ b/sys/miscfs/fuse/fuse_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vfsops.c,v 1.46 2024/05/07 14:27:11 mvs Exp $ */ +/* $OpenBSD: fuse_vfsops.c,v 1.47 2024/05/20 09:11:21 mvs Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon * @@ -114,8 +114,6 @@ fusefs_mount(struct mount *mp, const char *path, void *data, fmp->allow_other = args->allow_other; mp->mnt_data = fmp; - /* FUSE file system is not truly local. */ - mp->mnt_flag &= ~MNT_LOCAL; vfs_getnewfsid(mp); memset(mp->mnt_stat.f_mntonname, 0, MNAMELEN); -- 2.20.1