From 37c18b30cb8e19db4e4d55050aed67863831b5c5 Mon Sep 17 00:00:00 2001 From: Akilesh Kailash Date: Thu, 20 Jul 2023 22:00:53 -0700 Subject: [PATCH] snapuserd: use local buffers for xor processing during sync I/O Bug: 291862304 Test: Incremental OTA on Pixel - Verify first stage boot logs Change-Id: Ifc4f1ec912ccc1d24673f7bb03b05129ce504fa1 Signed-off-by: Akilesh Kailash --- .../libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp | 2 +- .../snapuserd/user-space-merge/snapuserd_readahead.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e52d752a0..2dd2ec09d 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 @@ 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 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 3e9588b53..8755820e1 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 @@ 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;