summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'fs_mgr/fs_mgr_avb.cpp')
-rw-r--r--fs_mgr/fs_mgr_avb.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp
index 6ea38335e..cf6b49702 100644
--- a/fs_mgr/fs_mgr_avb.cpp
+++ b/fs_mgr/fs_mgr_avb.cpp
@@ -303,7 +303,7 @@ static std::string construct_verity_table(const AvbHashtreeDescriptor& hashtree_
303 303
304static bool load_verity_table(struct dm_ioctl* io, const std::string& dm_device_name, int fd, 304static bool load_verity_table(struct dm_ioctl* io, const std::string& dm_device_name, int fd,
305 uint64_t image_size, const std::string& verity_table) { 305 uint64_t image_size, const std::string& verity_table) {
306 fs_mgr_verity_ioctl_init(io, dm_device_name); 306 fs_mgr_dm_ioctl_init(io, DM_BUF_SIZE, dm_device_name);
307 307
308 // The buffer consists of [dm_ioctl][dm_target_spec][verity_params]. 308 // The buffer consists of [dm_ioctl][dm_target_spec][verity_params].
309 char* buffer = (char*)io; 309 char* buffer = (char*)io;
@@ -360,14 +360,14 @@ static bool hashtree_dm_verity_setup(struct fstab_rec* fstab_entry,
360 alignas(dm_ioctl) char buffer[DM_BUF_SIZE]; 360 alignas(dm_ioctl) char buffer[DM_BUF_SIZE];
361 struct dm_ioctl* io = (struct dm_ioctl*)buffer; 361 struct dm_ioctl* io = (struct dm_ioctl*)buffer;
362 const std::string mount_point(basename(fstab_entry->mount_point)); 362 const std::string mount_point(basename(fstab_entry->mount_point));
363 if (!fs_mgr_create_verity_device(io, mount_point, fd)) { 363 if (!fs_mgr_dm_create_device(io, mount_point, fd)) {
364 LERROR << "Couldn't create verity device!"; 364 LERROR << "Couldn't create verity device!";
365 return false; 365 return false;
366 } 366 }
367 367
368 // Gets the name of the device file. 368 // Gets the name of the device file.
369 std::string verity_blk_name; 369 std::string verity_blk_name;
370 if (!fs_mgr_get_verity_device_name(io, mount_point, fd, &verity_blk_name)) { 370 if (!fs_mgr_dm_get_device_name(io, mount_point, fd, &verity_blk_name)) {
371 LERROR << "Couldn't get verity device number!"; 371 LERROR << "Couldn't get verity device number!";
372 return false; 372 return false;
373 } 373 }
@@ -386,7 +386,7 @@ static bool hashtree_dm_verity_setup(struct fstab_rec* fstab_entry,
386 } 386 }
387 387
388 // Activates the device. 388 // Activates the device.
389 if (!fs_mgr_resume_verity_table(io, mount_point, fd)) { 389 if (!fs_mgr_dm_resume_table(io, mount_point, fd)) {
390 return false; 390 return false;
391 } 391 }
392 392