Merge pull request #1126 from trapexit/removeallowother

Hard code setting of allow_other, ignore when set

README.md

@@ -1,6 +1,6 @@
 % mergerfs(1) mergerfs user manual
 % Antonio SJ Musumeci <trapexit@spawn.link>
-% 2023-01-25
+% 2023-01-26
 
 # NAME
 
@@ -90,11 +90,11 @@ start with one of the following option sets.
 
 #### You need `mmap` (used by rtorrent and many sqlite3 base software)
 
-`allow_other,cache.files=partial,dropcacheonclose=true,category.create=mfs`
+`cache.files=partial,dropcacheonclose=true,category.create=mfs`
 
 #### You don't need `mmap`
 
-`allow_other,cache.files=off,dropcacheonclose=true,category.create=mfs`
+`cache.files=off,dropcacheonclose=true,category.create=mfs`
 
 
 See the mergerfs [wiki for real world deployments](https://github.com/trapexit/mergerfs/wiki/Real-World-Deployments) for comparisons / ideas.
@@ -109,9 +109,6 @@ These options are the same regardless of whether you use them with the `mergerfs
 * **config**: Path to a config file. Same arguments as below in
   key=val / ini style format.
 * **branches**: Colon delimited list of branches.
-* **allow_other**: A libfuse option which allows users besides the one
-  which ran mergerfs to see the filesystem. This is required for most
-  use-cases.
 * **minfreespace=SIZE**: The minimum space value used for creation
   policies. Can be overridden by branch specific option. Understands
   'K', 'M', and 'G' to represent kilobyte, megabyte, and gigabyte
@@ -287,7 +284,7 @@ To make it easier to include multiple branches mergerfs supports [globbing](http
 
 
 ```
-# mergerfs -o allow_other /mnt/disk\*:/mnt/cdrom /media/drives
+# mergerfs /mnt/disk\*:/mnt/cdrom /media/drives
 ```
 
 The above line will use all mount points in /mnt prefixed with **disk** and the **cdrom**.
@@ -296,7 +293,7 @@ To have the pool mounted at boot or otherwise accessible from related tools use
 
 ```
 # <file system>        <mount point>  <type>         <options>             <dump>  <pass>
-/mnt/disk*:/mnt/cdrom  /mnt/pool      fuse.mergerfs  allow_other           0       0
+/mnt/disk*:/mnt/cdrom  /mnt/pool      fuse.mergerfs  minfreespace=16G      0       0
 ```
 
 **NOTE:** the globbing is done at mount or when updated using the runtime API. If a new directory is added matching the glob after the fact it will not be automatically included.
@@ -985,7 +982,7 @@ echo 3 | sudo tee /proc/sys/vm/drop_caches
 
 * This document is very literal and thorough. Unless there is a bug things work as described. If a suspected feature isn't mentioned it doesn't exist. If certain libfuse arguments aren't listed they probably shouldn't be used.
 * Ensure you're using the latest version. Few distros have the latest version.
-* Run mergerfs as `root` (with **allow_other**) unless you're merging paths which are owned exclusively and fully by the same user otherwise strange permission issues may arise. mergerfs is designed and intended to be run as `root`.
+* Run mergerfs as `root` unless you're merging paths which are owned exclusively and fully by the same user otherwise strange permission issues may arise. mergerfs is designed and intended to be run as `root`.
 * If you don't see some directories and files you expect, policies seem to skip branches, you get strange permission errors, etc. be sure the underlying filesystems' permissions are all the same. Use `mergerfs.fsck` to audit the drive for out of sync permissions.
 * If you still have permission issues be sure you are using POSIX ACL compliant filesystems. mergerfs doesn't generally make exceptions for FAT, NTFS, or other non-POSIX filesystem.
 * Do **not** use `cache.files=off` if you expect applications (such as rtorrent) to use [mmap](http://linux.die.net/man/2/mmap) files. Shared mmap is not currently supported in FUSE w/ page caching disabled. Enabling `dropcacheonclose` is recommended when `cache.files=partial|full|auto-full`.
@@ -1160,7 +1157,7 @@ Depends on what features you want. Generally speaking there are no "wrong" setti
 
 That said, for the average person, the following should be fine:
 
-`-o cache.files=off,dropcacheonclose=true,allow_other,category.create=mfs`
+`-o cache.files=off,dropcacheonclose=true,category.create=mfs`
 
 
 #### Why are all my files ending up on 1 drive?!
@@ -1265,7 +1262,7 @@ Below is an example of mhddfs and mergerfs setup to work similarly.
 
 `mhddfs -o mlimit=4G,allow_other /mnt/drive1,/mnt/drive2 /mnt/pool`
 
-`mergerfs -o minfreespace=4G,allow_other,category.create=ff /mnt/drive1:/mnt/drive2 /mnt/pool`
+`mergerfs -o minfreespace=4G,category.create=ff /mnt/drive1:/mnt/drive2 /mnt/pool`
 
 
 #### Why use mergerfs over aufs?

libfuse/lib/mount_generic.c

@@ -61,7 +61,6 @@ enum {
 };
 
 struct mount_opts {
-  int allow_other;
   int ishelp;
   int flags;
   int auto_unmount;
@@ -77,12 +76,10 @@ struct mount_opts {
 #define FUSE_MOUNT_OPT(t, p) { t, offsetof(struct mount_opts, p), 1 }
 
 static const struct fuse_opt fuse_mount_opts[] = {
-  FUSE_MOUNT_OPT("allow_other",		allow_other),
   FUSE_MOUNT_OPT("blkdev",		blkdev),
   FUSE_MOUNT_OPT("auto_unmount",		auto_unmount),
   FUSE_MOUNT_OPT("fsname=%s",		fsname),
   FUSE_MOUNT_OPT("subtype=%s",		subtype),
-  FUSE_OPT_KEY("allow_other",		KEY_KERN_OPT),
   FUSE_OPT_KEY("auto_unmount",		KEY_FUSERMOUNT_OPT),
   FUSE_OPT_KEY("blkdev",			KEY_FUSERMOUNT_OPT),
   FUSE_OPT_KEY("fsname=",			KEY_FUSERMOUNT_OPT),
@@ -121,7 +118,6 @@ static const struct fuse_opt fuse_mount_opts[] = {
 static void mount_help(void)
 {
   fprintf(stderr,
-          "    -o allow_other         allow access to other users\n"
           "    -o auto_unmount        auto unmount on process termination\n"
           "    -o default_permissions enable permission checking by kernel\n"
           "    -o fsname=NAME         set filesystem name\n"
@@ -553,6 +549,8 @@ int fuse_kern_mount(const char *mountpoint, struct fuse_args *args)
       fuse_opt_parse(args, &mo, fuse_mount_opts, fuse_mount_opt_proc) == -1)
     return -1;
 
+  fuse_opt_add_opt(&mo.kernel_opts,"allow_other");
+
   res = 0;
   if (mo.ishelp)
     goto out;

src/option_parser.cpp

@@ -125,7 +125,8 @@ should_ignore(const std::string &key_)
       "defaults",
       "hard_remove",
       "nonempty",
-      "use_ino"
+      "use_ino",
+      "allow_other"
     };
 
   return (IGNORED_KEYS.find(key_) != IGNORED_KEYS.end());