hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to new caching block store

Browse Source
This commit is contained in:
Sebastian Messmer 2017-08-21 23:11:45 +01:00
parent 509bf6cc26
commit 9d298bad6c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryfs/filesystem/CryDevice.cpp
View File

@ -1,4 +1,4 @@
#include <blockstore/implementations/caching/CachingBlockStore.h> #include <blockstore/implementations/caching2/CachingBlockStore2.h>
#include <cpp-utils/crypto/symmetric/ciphers.h> #include <cpp-utils/crypto/symmetric/ciphers.h>
#include "parallelaccessfsblobstore/DirBlobRef.h" #include "parallelaccessfsblobstore/DirBlobRef.h"
#include "CryDevice.h" #include "CryDevice.h"
@ -36,7 +36,7 @@ using blobstore::BlobStore;
using blockstore::lowtohighlevel::LowToHighLevelBlockStore; using blockstore::lowtohighlevel::LowToHighLevelBlockStore;
using blobstore::onblocks::BlobStoreOnBlocks; using blobstore::onblocks::BlobStoreOnBlocks;
using blobstore::onblocks::BlobOnBlocks; using blobstore::onblocks::BlobOnBlocks;
using blockstore::caching::CachingBlockStore; using blockstore::caching::CachingBlockStore2;
using blockstore::versioncounting::VersionCountingBlockStore2; using blockstore::versioncounting::VersionCountingBlockStore2;
using gitversion::VersionCompare; using gitversion::VersionCompare;
using cpputils::unique_ref; using cpputils::unique_ref;
@ -94,8 +94,8 @@ unique_ref<blobstore::BlobStore> CryDevice::CreateBlobStore(unique_ref<BlockStor
// Create versionCountingEncryptedBlockStore not in the same line as BlobStoreOnBlocks, because it can modify BlocksizeBytes // Create versionCountingEncryptedBlockStore not in the same line as BlobStoreOnBlocks, because it can modify BlocksizeBytes
// in the configFile and therefore has to be run before the second parameter to the BlobStoreOnBlocks parameter is evaluated. // in the configFile and therefore has to be run before the second parameter to the BlobStoreOnBlocks parameter is evaluated.
return make_unique_ref<BlobStoreOnBlocks>( return make_unique_ref<BlobStoreOnBlocks>(
make_unique_ref<CachingBlockStore>(
make_unique_ref<LowToHighLevelBlockStore>( make_unique_ref<LowToHighLevelBlockStore>(
make_unique_ref<CachingBlockStore2>(
std::move(versionCountingEncryptedBlockStore) std::move(versionCountingEncryptedBlockStore)
) )
), ),