Add --auto-unmount flag to simple.rs

Author: cberner

examples/simple.rs

@@ -1997,6 +1997,12 @@ fn main() {
                 .requires("mount-point")
                 .help("Mount FUSE with direct IO"),
         )
+        .arg(
+            Arg::new("auto-unmount")
+                .long("auto-unmount")
+                .action(ArgAction::SetTrue)
+                .help("Automatically unmount FUSE when process exits"),
+        )
         .arg(
             Arg::new("fsck")
                 .long("fsck")
@@ -2037,12 +2043,9 @@ fn main() {
         if matches.get_flag("suid") {
             info!("setuid bit support enabled");
             options.push(MountOption::Suid);
-        } else {
-            options.push(MountOption::AutoUnmount);
         }
     }
-    #[cfg(not(feature = "abi-7-26"))]
-    {
+    if matches.get_flag("auto-unmount") {
         options.push(MountOption::AutoUnmount);
     }
     if let Ok(enabled) = fuse_allow_other_enabled() {

mount_tests.sh

@@ -62,7 +62,7 @@ function test_no_user_allow_other {
   DIR=$(su fusertestnoallow -c "mktemp --directory")
   DATA_DIR=$(su fusertestnoallow -c "mktemp --directory")
   cargo build --example simple $1 > /dev/null 2>&1
-  su fusertestnoallow -c "target/debug/examples/simple -vvv --data-dir $DATA_DIR --mount-point $DIR"
+  su fusertestnoallow -c "target/debug/examples/simple --auto-unmount -vvv --data-dir $DATA_DIR --mount-point $DIR"
   exitCode=$?
   if [[ $exitCode -eq 2 ]]; then
       echo -e "$GREEN OK Detected lack of user_allow_other: $2 $NC"

pjdfs.sh

@@ -13,7 +13,7 @@ export RUST_BACKTRACE=1
 DATA_DIR=$(mktemp --directory)
 DIR=$(mktemp --directory)
 
-fuser -vvv --suid --data-dir $DATA_DIR --mount-point $DIR > /code/logs/mount.log 2>&1 &
+fuser -vvv --auto-unmount --suid --data-dir $DATA_DIR --mount-point $DIR > /code/logs/mount.log 2>&1 &
 FUSE_PID=$!
 sleep 0.5
 

xfstests.sh

@@ -124,7 +124,7 @@ echo "generic/531" >> xfs_excludes.txt
 echo "generic/564" >> xfs_excludes.txt
 
 
-FUSER_EXTRA_MOUNT_OPTIONS="" TEST_DEV="$TEST_DATA_DIR" TEST_DIR="$TEST_DIR" SCRATCH_DEV="$SCRATCH_DATA_DIR" SCRATCH_MNT="$SCRATCH_DIR" \
+FUSER_EXTRA_MOUNT_OPTIONS="--auto-unmount" TEST_DEV="$TEST_DATA_DIR" TEST_DIR="$TEST_DIR" SCRATCH_DEV="$SCRATCH_DATA_DIR" SCRATCH_MNT="$SCRATCH_DIR" \
 ./check-fuser -E xfs_excludes.txt "$@" \
 | tee /code/logs/xfstests.log