| commit | 64062f8f4a8b6696653d130e4ca0ad265e3b2135 | [log] [tgz] |
|---|---|---|
| author | Yi-Yo Chiang <yochiang@google.com> | Mon Jul 24 09:53:26 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jul 24 09:53:26 2023 +0000 |
| tree | 5d7e363950e09e7a5e5bc7d9e599e1f15204d8a2 | |
| parent | da2fc1c6af92f06488241991d02a2f2af4fb843c [diff] | |
| parent | 98e3522762797ecadca62a5732372c51b60dfc59 [diff] |
Merge changes I2581fd7c,I1ed57e6d into main * changes: fs_mgr: Refactor by inlining trivial helpers fs_mgr_overlayfs: Make all string constants constexpr
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;