| commit | 4a875cf94809261a98310ba49b8b1d85a55f064a | [log] [tgz] |
|---|---|---|
| author | Akilesh Kailash <akailash@google.com> | Fri Jul 21 23:02:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 21 23:02:26 2023 +0000 |
| tree | 854926556576ed794396b0c598c79c856110c7af | |
| parent | fe0b2355fca4fda669ec85467a5c3b9443349cc2 [diff] | |
| parent | da2fc1c6af92f06488241991d02a2f2af4fb843c [diff] |
Merge "snapuserd: use local buffers for xor processing during sync I/O" into main am: da2fc1c6af Original change: https://android-review.googlesource.com/c/platform/system/core/+/2670338 Change-Id: I74d7b735946334b824d88baee8ad2b3a51751e10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp index e52d752..2dd2ec0 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
@@ -308,7 +308,7 @@ 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
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp index 3e9588b..8755820 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp
@@ -592,7 +592,7 @@ // 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;