| commit | aa5be17a2a16a54d9a8e8f9f5b3f1bd26d762b6d | [log] [tgz] |
|---|---|---|
| author | Akilesh Kailash <akailash@google.com> | Tue May 04 04:47:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 04:47:11 2021 +0000 |
| tree | 2304958e5c43330c831e49540ef7cbcd3f6fd882 | |
| parent | fcc5b53c7e2d2a12a9b09b15905584b314907039 [diff] | |
| parent | 362b2b7537b1c3aa20c48a3ecb2bc12cca9963c0 [diff] |
Merge changes from topic "snapuserd-enable-read-ahead" am: 362b2b7537 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690661 Change-Id: Iccce1cbfcd7e99e40a5be8ff8a4ecbc64ba24cb0
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h index c05b7ef..000e5e1 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
@@ -24,7 +24,7 @@ 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);
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h index 1192e7d..f43ea68 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_writer.h
@@ -37,7 +37,7 @@ // 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