commit 8c57f7fd1c5bf2f0c8b04614ca1f3d48a5c5c047
author Hung Nguyen <hungmn@google.com> Tue Feb 25 17:27:46 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 25 17:27:46 2025 -0800
tree 70ae3d71117f7cd7c3b1de80a71a5f898ac51c23
parent a2193302225bc0716d8a9ecc85f2443bc6e2ee46
parent 9f7f756db3ed54fe21a0ff2fb4715db6de6912ca

Merge "Check autoclear setup using block sysfs" into main am: ab25289bfb am: 9f7f756db3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3507105

Change-Id: Idabd8d286ae6a32f51149efd5a02e90ebf305543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/devicemapper/src/loopdevice.rs

diff --git a/libs/devicemapper/src/loopdevice.rs b/libs/devicemapper/src/loopdevice.rs
index b830eda..30ab6f6 100644
--- a/libs/devicemapper/src/loopdevice.rs
+++ b/libs/devicemapper/src/loopdevice.rs
@@ -199,6 +199,12 @@
         "0" == fs::read_to_string(ro).unwrap().trim()
     }
 
+    fn is_autoclear(dev: &Path) -> bool {
+        let autoclear =
+            Path::new("/sys/block").join(dev.file_name().unwrap()).join("loop/autoclear");
+        "1" == fs::read_to_string(autoclear).unwrap().trim()
+    }
+
     #[rdroidtest]
     fn attach_loop_device_with_dio() {
         let a_dir = tempfile::TempDir::new().unwrap();
@@ -258,10 +264,7 @@
         let dev =
             attach(a_file, 0, a_size, &LoopConfigOptions { autoclear: true, ..Default::default() })
                 .unwrap();
-        drop(dev.file);
 
-        let dev_size_path =
-            Path::new("/sys/block").join(dev.path.file_name().unwrap()).join("size");
-        assert_eq!("0", fs::read_to_string(dev_size_path).unwrap().trim());
+        assert!(is_autoclear(&dev.path));
     }
 }