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

Commit 50fe91fa authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "snapuserd: use local buffers for xor processing during sync I/O" into... 

Merge "snapuserd: use local buffers for xor processing during sync I/O" into main am: da2fc1c6 am: 4a875cf9 am: db59d43a am: 1218ca78

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



Change-Id: I7385339f19bd4a276b75141616d2c4eae70a51d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2518f622 1218ca78

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ bool SnapshotHandler::Start() { 
        ra_thread_status =

                std::async(std::launch::async, &ReadAhead::RunThread, read_ahead_thread_.get());



        SNAP_LOG(INFO) << "Read-ahead thread started...";

        SNAP_LOG(INFO) << "Read-ahead thread started";

    }



    // Launch worker threads

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ bool ReadAhead::ReadAheadSyncIO() { 
            // Check if this block is an XOR op

            if (xor_op->new_block == new_block) {

                // Read the xor'ed data from COW

                void* buffer = bufsink_.GetPayloadBuffer(BLOCK_SZ);

                void* buffer = bufsink.GetPayloadBuffer(BLOCK_SZ);

                if (!buffer) {

                    SNAP_LOG(ERROR) << "ReadAhead - failed to allocate buffer";

                    return false;