diff --git a/fs_mgr/fs_mgr_roots.cpp b/fs_mgr/fs_mgr_roots.cpp index 58ef9b6cd..1e655877f 100644 --- a/fs_mgr/fs_mgr_roots.cpp +++ b/fs_mgr/fs_mgr_roots.cpp @@ -101,7 +101,9 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& } } - auto mounted = GetMountState(rec->mount_point); + const std::string mount_point = mount_pt.empty() ? rec->mount_point : mount_pt; + + auto mounted = GetMountState(mount_point); if (mounted == MountState::ERROR) { return false; } @@ -109,8 +111,6 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& return true; } - const std::string mount_point = mount_pt.empty() ? rec->mount_point : mount_pt; - static const std::vector supported_fs{"ext4", "squashfs", "vfat", "f2fs", "none"}; if (std::find(supported_fs.begin(), supported_fs.end(), rec->fs_type) == supported_fs.end()) { LERROR << "unknown fs_type \"" << rec->fs_type << "\" for " << mount_point;