summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2019-08-16 19:41:22 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-08-16 19:41:22 +0200
commit18c3f78779792088c56cb6cdd353f7c502876d4c (patch)
treed82ba8ab841dbb542db23e8ca22b796e48945cd1
parentMerge "Remove common.h" (diff)
parentupdater: Fix build for new CreateLogicalPartition signature. (diff)
downloadandroid_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.tar
android_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.tar.gz
android_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.tar.bz2
android_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.tar.lz
android_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.tar.xz
android_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.tar.zst
android_bootable_recovery-18c3f78779792088c56cb6cdd353f7c502876d4c.zip
-rw-r--r--updater/updater_runtime_dynamic_partitions.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/updater/updater_runtime_dynamic_partitions.cpp b/updater/updater_runtime_dynamic_partitions.cpp
index b084f6592..be9250a81 100644
--- a/updater/updater_runtime_dynamic_partitions.cpp
+++ b/updater/updater_runtime_dynamic_partitions.cpp
@@ -35,6 +35,7 @@
using android::dm::DeviceMapper;
using android::dm::DmDeviceState;
using android::fs_mgr::CreateLogicalPartition;
+using android::fs_mgr::CreateLogicalPartitionParams;
using android::fs_mgr::DestroyLogicalPartition;
using android::fs_mgr::LpMetadata;
using android::fs_mgr::MetadataBuilder;
@@ -64,8 +65,14 @@ bool UpdaterRuntime::MapPartitionOnDeviceMapper(const std::string& partition_nam
std::string* path) {
auto state = DeviceMapper::Instance().GetState(partition_name);
if (state == DmDeviceState::INVALID) {
- return CreateLogicalPartition(GetSuperDevice(), 0 /* metadata slot */, partition_name,
- true /* force writable */, kMapTimeout, path);
+ CreateLogicalPartitionParams params = {
+ .block_device = GetSuperDevice(),
+ .metadata_slot = 0,
+ .partition_name = partition_name,
+ .force_writable = true,
+ .timeout_ms = kMapTimeout,
+ };
+ return CreateLogicalPartition(params, path);
}
if (state == DmDeviceState::ACTIVE) {