Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14258369 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Gerrit Code Review
Browse files

Merge "libsnapshot: update type" into main

parents 5e4b3263 6ca4d66a

fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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: "

fs_mgr/libsnapshot/snapshot.cpp

+8 −7
Original line number Diff line number Diff line
@@ -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;