From 129cfa541556f3bb964be51fc447e6ecaf579fcf Mon Sep 17 00:00:00 2001 From: Leonid Usov Date: Sun, 6 Aug 2023 11:28:40 +0300 Subject: [PATCH] mount.fuse.ceph: strip the 'nofail' option from those that fuse will see Signed-off-by: Leonid Usov Fixes: https://tracker.ceph.com/issues/58394 --- src/mount.fuse.ceph | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph index 59a296d964fe..c4b61dbcbd2c 100755 --- a/src/mount.fuse.ceph +++ b/src/mount.fuse.ceph @@ -39,8 +39,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): -- 2.47.3