From a6f6a9dcdf287eaa490c8b535ee70e85f961dbf5 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Thu, 19 Jan 2023 15:56:25 +0000
Subject: [PATCH] mount,mount2,cmount: fix --allow-non-empty #3562

Since version 3 of fuse libfuse no longer does anything when given the
nonempty option and it's default is to allow mounting over non empty
directories like normal mount does.

Some versions of libfuse give an error when using `--allow-non-empty`
which is annoying for the user.

We now do this check ourselves so we no longer need to pass the option
to libfuse.

Fixes #3562
---
 cmd/cmount/mount.go | 3 ---
 cmd/mount/mount.go  | 3 ---
 cmd/mount2/mount.go | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/cmd/cmount/mount.go b/cmd/cmount/mount.go
index c9893f2f7..919f5d895 100644
--- a/cmd/cmount/mount.go
+++ b/cmd/cmount/mount.go
@@ -84,9 +84,6 @@ func mountOptions(VFS *vfs.VFS, device string, mountpoint string, opt *mountlib.
 		if opt.DaemonTimeout != 0 {
 			options = append(options, "-o", fmt.Sprintf("daemon_timeout=%d", int(opt.DaemonTimeout.Seconds())))
 		}
-		if opt.AllowNonEmpty {
-			options = append(options, "-o", "nonempty")
-		}
 		if opt.AllowOther {
 			options = append(options, "-o", "allow_other")
 		}
diff --git a/cmd/mount/mount.go b/cmd/mount/mount.go
index 765419df4..923681c7c 100644
--- a/cmd/mount/mount.go
+++ b/cmd/mount/mount.go
@@ -34,9 +34,6 @@ func mountOptions(VFS *vfs.VFS, device string, opt *mountlib.Options) (options [
 	if opt.AsyncRead {
 		options = append(options, fuse.AsyncRead())
 	}
-	if opt.AllowNonEmpty {
-		options = append(options, fuse.AllowNonEmptyMount())
-	}
 	if opt.AllowOther {
 		options = append(options, fuse.AllowOther())
 	}
diff --git a/cmd/mount2/mount.go b/cmd/mount2/mount.go
index cbb890500..48e2f820e 100644
--- a/cmd/mount2/mount.go
+++ b/cmd/mount2/mount.go
@@ -95,9 +95,6 @@ func mountOptions(fsys *FS, f fs.Fs, opt *mountlib.Options) (mountOpts *fuse.Mou
 	}
 	var opts []string
 	// FIXME doesn't work opts = append(opts, fmt.Sprintf("max_readahead=%d", maxReadAhead))
-	if fsys.opt.AllowNonEmpty {
-		opts = append(opts, "nonempty")
-	}
 	if fsys.opt.AllowOther {
 		opts = append(opts, "allow_other")
 	}