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

Commit d9c17e91 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Concatenate conditional" into main am: 55287774 

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



Change-Id: I747433f20360ab65634db2642a8970c622d14d2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b19c86cd 55287774

fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp

+2 −4
Original line number Diff line number Diff line
@@ -636,10 +636,8 @@ bool CowWriterV2::FlushCluster() { 
}



bool CowWriterV2::WriteOperation(const CowOperation& op, const void* data, size_t size) {

    if (!EnsureSpaceAvailable(next_op_pos_ + sizeof(op))) {

        return false;

    }

    if (!EnsureSpaceAvailable(next_data_pos_ + size)) {

    if (!EnsureSpaceAvailable(next_op_pos_ + sizeof(op)) ||

        !EnsureSpaceAvailable(next_data_pos_ + size)) {

        return false;

    }