Removed -o nopath - it never did anything

We are overriding this setting with the flag in struct fuse_operations:

$ example/hello -f -d  ~/tmp/mnt
FUSE library version: 3.0.0pre0
nopath: 0
unique: 1, opcode: INIT (26), nodeid: 0, insize: 56, pid: 0
INIT: 7.25
flags=0x0007fffb
max_readahead=0x00020000
   INIT: 7.23
   flags=0x00006031
   max_readahead=0x00020000
   max_write=0x00020000
   max_background=0
   congestion_threshold=0
   time_gran=0
   unique: 1, success, outsize: 80

$ example/hello -f -d  ~/tmp/mnt -o nopath
FUSE library version: 3.0.0pre0
nopath: 0
unique: 1, opcode: INIT (26), nodeid: 0, insize: 56, pid: 0
INIT: 7.25
flags=0x0007fffb
max_readahead=0x00020000
   INIT: 7.23
   flags=0x00006031
   max_readahead=0x00020000
   max_write=0x00020000
   max_background=0
   congestion_threshold=0
   time_gran=0
   unique: 1, success, outsize: 80

diff --git a/ChangeLog.rst b/ChangeLog.rst
index e3ebb89a62f0c990f4634de58c95db1fda469693..1748855a689f42187f2b4a0558bc4f696ea5fea0 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,10 @@
 Unreleased Changes
 ==================
 
+* The ``-o nopath`` option has been dropped - it never actually did
+  anything (since it is unconditionally overwritten with the value of
+  the `nopath` flag in `struct fuse_operations).
+
 * The ``-o large_read`` mount option has been dropped. Hopefully no
   one uses a Linux 2.4 kernel anymore.
 

diff --git a/lib/fuse.c b/lib/fuse.c
index 612b1b65f474bde33b89cef71397699df461ac25..826de4eee217db65ed837ee65b08888e5c0dcf28 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4406,7 +4406,6 @@ static const struct fuse_opt fuse_lib_opts[] = {
        FUSE_LIB_OPT("negative_timeout=%lf",  negative_timeout, 0),
        FUSE_LIB_OPT("noforget",              remember, -1),
        FUSE_LIB_OPT("remember=%u",           remember, 0),
-       FUSE_LIB_OPT("nopath",                nopath, 1),
        FUSE_LIB_OPT("intr",                  intr, 1),
        FUSE_LIB_OPT("intr_signal=%d",        intr_signal, 0),
        FUSE_LIB_OPT("modules=%s",            modules, 0),
@@ -4432,7 +4431,6 @@ static void fuse_lib_help(void)
 "    -o ac_attr_timeout=T   auto cache timeout for attributes (attr_timeout)\n"
 "    -o noforget            never forget cached inodes\n"
 "    -o remember=T          remember cached inodes for T seconds (0s)\n"
-"    -o nopath              don't supply path if not necessary\n"
 "    -o intr                allow requests to be interrupted\n"
 "    -o intr_signal=NUM     signal to send on interrupt (%i)\n"
 "    -o modules=M1[:M2...]  names of modules to push onto filesystem stack\n\n",