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

Commit 78d8d5d9 authored by David Anderson's avatar David Anderson
Browse files

snapuserd: Remove IByteSink usage from legacy snapuserd. 

Bug: 278637212
Test: vabc_legacy_tests
      apply ota on CF w/ userspace snapshots disabled
Change-Id: Ia17bcc862ed9a7d7b78732139f457cac58fa79b9
parent ed4c853d

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_worker.cpp

+9 −3
Original line number Diff line number Diff line
@@ -95,11 +95,17 @@ void WorkerThread::ConstructKernelCowHeader() { 
// internal COW format and if the block is compressed,

// it will be de-compressed.

bool WorkerThread::ProcessReplaceOp(const CowOperation* cow_op) {

    if (!reader_->ReadData(*cow_op, &bufsink_)) {

        SNAP_LOG(ERROR) << "ProcessReplaceOp failed for block " << cow_op->new_block;

    void* buffer = bufsink_.GetPayloadBuffer(BLOCK_SZ);

    if (!buffer) {

        SNAP_LOG(ERROR) << "No space in buffer sink";

        return false;

    }

    ssize_t rv = reader_->ReadData(*cow_op, buffer, BLOCK_SZ);

    if (rv != BLOCK_SZ) {

        SNAP_LOG(ERROR) << "ProcessReplaceOp failed for block " << cow_op->new_block

                        << ", return = " << rv;

        return false;

    }



    return true;

}