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

Commit 646db6c4 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge changes from topic "snapuserd-enable-read-ahead" am: 362b2b75 am: aa5be17a 

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

Change-Id: I3d4a8307106710447a1eb91a2fecceab9a779216
parents 6093592f aa5be17a

fs_mgr/libsnapshot/include/libsnapshot/cow_format.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static constexpr uint64_t kCowMagicNumber = 0x436f77634f572121ULL; 
static constexpr uint32_t kCowVersionMajor = 2;

static constexpr uint32_t kCowVersionMinor = 0;



static constexpr uint32_t kCowVersionManifest = 1;

static constexpr uint32_t kCowVersionManifest = 2;



static constexpr uint32_t BLOCK_SZ = 4096;

static constexpr uint32_t BLOCK_SHIFT = (__builtin_ffs(BLOCK_SZ) - 1);

fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct CowOptions { 
    // Number of CowOperations in a cluster. 0 for no clustering. Cannot be 1.

    uint32_t cluster_ops = 200;



    bool scratch_space = false;

    bool scratch_space = true;

};



// Interface for writing to a snapuserd COW. All operations are ordered; merges