Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 583941c6 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Remove unused variable mount_point" am: b634c6f5 am: 65bbf1c1 am: 1ca84eea 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2504916



Change-Id: I3b3c3dc2deba9cf5303a9d5ebdc5bf125edfb853
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6d0ea56 1ca84eea

fs_mgr/libfs_avb/avb_util.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,6 @@ bool HashtreeDmVeritySetup(FstabEntry* fstab_entry, const FsAvbHashtreeDescripto 
    if (wait_for_verity_dev) timeout = 1s;

    if (wait_for_verity_dev) timeout = 1s;





    std::string dev_path;

    std::string dev_path;

    const std::string mount_point(Basename(fstab_entry->mount_point));

    const std::string device_name(GetVerityDeviceName(*fstab_entry));

    const std::string device_name(GetVerityDeviceName(*fstab_entry));

    android::dm::DeviceMapper& dm = android::dm::DeviceMapper::Instance();

    android::dm::DeviceMapper& dm = android::dm::DeviceMapper::Instance();

    if (!dm.CreateDevice(device_name, table, &dev_path, timeout)) {

    if (!dm.CreateDevice(device_name, table, &dev_path, timeout)) {