mount.fuse.ceph: strip the 'nofail' option from those that fuse will see

Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
Fixes: https://tracker.ceph.com/issues/58394
(cherry picked from commit 129cfa541556f3bb964be51fc447e6ecaf579fcf)

diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
index c61625a8c2f58bd2b02b8347ba17552f2eac2486..c18ff335118e1243e0530dd2fb2b11ebc09ee95b 100755 (executable)
--- a/src/mount.fuse.ceph
+++ b/src/mount.fuse.ceph
@@ -37,8 +37,11 @@ def ceph_options_compat(device):
     return [ 'ceph.' + opt for opt in device.split(',') ]
 
 def fs_options(opts, ceph_opts):
-    # strip out noauto and _netdev options; libfuse doesn't like it
-    strip_opts = ['defaults', 'noauto', '_netdev']
+    # - strip out noauto and _netdev options; libfuse doesn't like it
+    # - nofail option is also not recognized by libfuse.
+    #   Starting with fuse 3.2.2 the option is also ignored by mount.fuse, see
+    #   https://github.com/libfuse/libfuse/commit/a83cd72f641671b71b8268b1765e449cae071f3e
+    strip_opts = ['defaults', 'noauto', '_netdev', 'nofail']
     return ','.join(list(set(opts) - set(ceph_opts) - set(strip_opts)))
 
 def main(arguments):