ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-11-06 10:15:46 +00:00 • committed by Gerrit Code Review
commit 41e9d7d3a2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
View file

@ -55,7 +55,7 @@ int MergeWorker::PrepareMerge(uint64_t* source_offset, int* pending_ops,
break;
}
*source_offset = cow_op->new_block * BLOCK_SZ;
*source_offset = static_cast<uint64_t>(cow_op->new_block) * BLOCK_SZ;
if (!checkOrderedOp) {
replace_zero_vec->push_back(cow_op);
if (cow_op->type() == kCowReplaceOp) {
@ -74,7 +74,7 @@ int MergeWorker::PrepareMerge(uint64_t* source_offset, int* pending_ops,
break;
}
uint64_t next_offset = op->new_block * BLOCK_SZ;
uint64_t next_offset = static_cast<uint64_t>(op->new_block) * BLOCK_SZ;
if (next_offset != (*source_offset + nr_consecutive * BLOCK_SZ)) {
break;
}