commit 79f7e3f1fc900519b4eebd0674e18f0aa0d7fd42
author Howard Chen <howardsoc@google.com> Wed Jan 20 02:45:23 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 20 02:45:23 2021 +0000
tree f100eb7e9a18e7ce617663b88dafdf060e6afcb2
parent a1d04e4de4e3dba6c021388015369b3d005e7e4a
parent 08deaa39d24c18617812570356fed38f7495048a

Merge "Fix the MapWithLoopDevice"

fs_mgr/libfiemap/image_manager.cpp

diff --git a/fs_mgr/libfiemap/image_manager.cpp b/fs_mgr/libfiemap/image_manager.cpp
index 93fc131..841f215 100644
--- a/fs_mgr/libfiemap/image_manager.cpp
+++ b/fs_mgr/libfiemap/image_manager.cpp
@@ -486,15 +486,14 @@
         if (!MapWithLoopDeviceList(loop_devices, name, timeout_ms, path)) {
             return false;
         }
+    } else {
+        auto status_message = "loop:" + loop_devices.back();
+        auto status_file = GetStatusFilePath(name);
+        if (!android::base::WriteStringToFile(status_message, status_file)) {
+            PLOG(ERROR) << "Write failed: " << status_file;
+            return false;
+        }
     }
-
-    auto status_message = "loop:" + loop_devices.back();
-    auto status_file = GetStatusFilePath(name);
-    if (!android::base::WriteStringToFile(status_message, status_file)) {
-        PLOG(ERROR) << "Write failed: " << status_file;
-        return false;
-    }
-
     auto_detach.Commit();
 
     *path = loop_devices.back();