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

Commit d84ebe94 authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

Merge "libdm: Add a helper function for GetState+DeleteDevice checks." 

am: b21f3dd7

Change-Id: I07bdebb088ff20c89a53d3445d07baa2b0c545ce
parents 55f74e58 b21f3dd7

fs_mgr/libdm/dm.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,13 @@ bool DeviceMapper::CreateDevice(const std::string& name, const std::string& uuid 
    return true;

    return true;

}

}





bool DeviceMapper::DeleteDeviceIfExists(const std::string& name) {

    if (GetState(name) == DmDeviceState::INVALID) {

        return true;

    }

    return DeleteDevice(name);

}



bool DeviceMapper::DeleteDevice(const std::string& name) {

bool DeviceMapper::DeleteDevice(const std::string& name) {

    struct dm_ioctl io;

    struct dm_ioctl io;

    InitIo(&io, name);

    InitIo(&io, name);

fs_mgr/libdm/include/libdm/dm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ class DeviceMapper final { 
    // Removes a device mapper device with the given name.

    // Removes a device mapper device with the given name.

    // Returns 'true' on success, false otherwise.

    // Returns 'true' on success, false otherwise.

    bool DeleteDevice(const std::string& name);

    bool DeleteDevice(const std::string& name);

    bool DeleteDeviceIfExists(const std::string& name);





    // Fetches and returns the complete state of the underlying device mapper

    // Fetches and returns the complete state of the underlying device mapper

    // device with given name.

    // device with given name.