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

Commit 536035be authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

Rename two local variables am: 06b95de9

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

Change-Id: I5097713f3d2912125fbf32f1765748328bd23586
parents 9545f38b 06b95de9
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -2071,22 +2071,22 @@ static bool PrepareZramBackingDevice(off64_t size) {

    // Allocate loop device and attach it to file_path.
    LoopControl loop_control;
    std::string device;
    if (!loop_control.Attach(target_fd.get(), 5s, &device)) {
    std::string loop_device;
    if (!loop_control.Attach(target_fd.get(), 5s, &loop_device)) {
        return false;
    }

    // set block size & direct IO
    unique_fd device_fd(TEMP_FAILURE_RETRY(open(device.c_str(), O_RDWR | O_CLOEXEC)));
    if (device_fd.get() == -1) {
        PERROR << "Cannot open " << device;
    unique_fd loop_fd(TEMP_FAILURE_RETRY(open(loop_device.c_str(), O_RDWR | O_CLOEXEC)));
    if (loop_fd.get() == -1) {
        PERROR << "Cannot open " << loop_device;
        return false;
    }
    if (!LoopControl::EnableDirectIo(device_fd.get())) {
    if (!LoopControl::EnableDirectIo(loop_fd.get())) {
        return false;
    }

    return InstallZramDevice(device);
    return InstallZramDevice(loop_device);
}

bool fs_mgr_swapon_all(const Fstab& fstab) {