tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libsnapshot: update type" into main am: 14258369ef

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

Change-Id: Ibd57839d562924067c254e160825dcb664f022e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Akilesh Kailash 2024-01-30 19:34:28 +00:00 committed by Automerger Merge Worker
commit c9d7942e5d
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h
View file

@ -53,7 +53,7 @@ struct CowOptions {
uint64_t num_merge_ops = 0;
// Number of threads for compression
int num_compress_threads = 0;
uint16_t num_compress_threads = 0;
// Batch write cluster ops
bool batch_write = false;

2
fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp
View file

@ -114,7 +114,7 @@ void CowWriterV3::SetupHeaders() {
}
bool CowWriterV3::ParseOptions() {
num_compress_threads_ = std::max(options_.num_compress_threads, 1);
num_compress_threads_ = std::max(int(options_.num_compress_threads), 1);
auto parts = android::base::Split(options_.compression, ",");
if (parts.size() > 2) {
LOG(ERROR) << "failed to parse compression parameters: invalid argument count: "

15
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -1142,8 +1142,8 @@ auto SnapshotManager::CheckMergeState(const std::function<bool()>& before_cancel
return result;
}
auto SnapshotManager::CheckMergeState(LockedFile* lock,
const std::function<bool()>& before_cancel) -> MergeResult {
auto SnapshotManager::CheckMergeState(LockedFile* lock, const std::function<bool()>& before_cancel)
-> MergeResult {
SnapshotUpdateStatus update_status = ReadSnapshotUpdateStatus(lock);
switch (update_status.state()) {
case UpdateState::None:
@ -1218,8 +1218,8 @@ auto SnapshotManager::CheckMergeState(LockedFile* lock,
wrong_phase = true;
break;
default:
LOG(ERROR) << "Unknown merge status for \"" << snapshot << "\": " << "\""
<< result.state << "\"";
LOG(ERROR) << "Unknown merge status for \"" << snapshot << "\": "
<< "\"" << result.state << "\"";
if (failure_code == MergeFailureCode::Ok) {
failure_code = MergeFailureCode::UnexpectedMergeState;
}
@ -2797,8 +2797,8 @@ bool SnapshotManager::UnmapAllSnapshots(LockedFile* lock) {
return true;
}
auto SnapshotManager::OpenFile(const std::string& file,
int lock_flags) -> std::unique_ptr<LockedFile> {
auto SnapshotManager::OpenFile(const std::string& file, int lock_flags)
-> std::unique_ptr<LockedFile> {
unique_fd fd(open(file.c_str(), O_RDONLY | O_CLOEXEC | O_NOFOLLOW));
if (fd < 0) {
PLOG(ERROR) << "Open failed: " << file;
@ -4344,7 +4344,8 @@ bool SnapshotManager::DeleteDeviceIfExists(const std::string& name,
}
}
LOG(ERROR) << "Device-mapper device " << name << "(" << full_path << ")" << " still in use."
LOG(ERROR) << "Device-mapper device " << name << "(" << full_path << ")"
<< " still in use."
<< " Probably a file descriptor was leaked or held open, or a loop device is"
<< " attached.";
return false;