From d7f34c0dfb1a965d65a813bb892d9d14f2f786a1 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <mail@smessmer.de>
Date: Tue, 8 Mar 2016 23:57:34 +0100
Subject: [PATCH] Make blocksize configurable

---
 src/cryfs/filesystem/CryDevice.cpp                          | 6 ++----
 src/cryfs/filesystem/CryDevice.h                            | 2 --
 .../filesystem/cachingfsblobstore/CachingFsBlobStore.h      | 5 +++++
 .../parallelaccessfsblobstore/ParallelAccessFsBlobStore.h   | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/cryfs/filesystem/CryDevice.cpp b/src/cryfs/filesystem/CryDevice.cpp
index 4b7b53c5..3fead795 100644
--- a/src/cryfs/filesystem/CryDevice.cpp
+++ b/src/cryfs/filesystem/CryDevice.cpp
@@ -45,8 +45,6 @@ namespace bf = boost::filesystem;
 
 namespace cryfs {
 
-constexpr uint32_t CryDevice::BLOCKSIZE_BYTES;
-
 CryDevice::CryDevice(CryConfigFile configFile, unique_ref<BlockStore> blockStore)
 : _fsBlobStore(
       make_unique_ref<ParallelAccessFsBlobStore>(
@@ -55,7 +53,7 @@ CryDevice::CryDevice(CryConfigFile configFile, unique_ref<BlockStore> blockStore
             make_unique_ref<BlobStoreOnBlocks>(
               make_unique_ref<CachingBlockStore>(
                 CreateEncryptedBlockStore(*configFile.config(), std::move(blockStore))
-              ), BLOCKSIZE_BYTES)))
+              ), configFile.config()->BlocksizeBytes())))
         )
       ),
   _rootKey(GetOrCreateRootKey(&configFile)),
@@ -140,7 +138,7 @@ void CryDevice::statfs(const bf::path &path, struct statvfs *fsstat) {
   callFsActionCallbacks();
   uint64_t numUsedBlocks = _fsBlobStore->numBlocks();
   uint64_t numFreeBlocks = _fsBlobStore->estimateSpaceForNumBlocksLeft();
-  fsstat->f_bsize = BLOCKSIZE_BYTES;
+  fsstat->f_bsize = _fsBlobStore->blocksizeBytes();
   fsstat->f_blocks = numUsedBlocks + numFreeBlocks;
   fsstat->f_bfree = numFreeBlocks;
   fsstat->f_bavail = numFreeBlocks;
diff --git a/src/cryfs/filesystem/CryDevice.h b/src/cryfs/filesystem/CryDevice.h
index c448ef21..ed2b22a5 100644
--- a/src/cryfs/filesystem/CryDevice.h
+++ b/src/cryfs/filesystem/CryDevice.h
@@ -37,8 +37,6 @@ public:
 
 private:
 
-  static constexpr uint32_t BLOCKSIZE_BYTES = 32 * 1024;
-
   cpputils::unique_ref<parallelaccessfsblobstore::ParallelAccessFsBlobStore> _fsBlobStore;
 
   blockstore::Key _rootKey;
diff --git a/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h b/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h
index ba7f6344..6915b03f 100644
--- a/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h
+++ b/src/cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h
@@ -24,6 +24,7 @@ namespace cryfs {
             cpputils::unique_ref<SymlinkBlobRef> createSymlinkBlob(const boost::filesystem::path &target);
             boost::optional<cpputils::unique_ref<FsBlobRef>> load(const blockstore::Key &key);
             void remove(cpputils::unique_ref<FsBlobRef> blob);
+            uint64_t blocksizeBytes() const;
             uint64_t numBlocks() const;
             uint64_t estimateSpaceForNumBlocksLeft() const;
 
@@ -80,6 +81,10 @@ namespace cryfs {
             _cache.push(key, std::move(baseBlob));
         }
 
+        inline uint64_t CachingFsBlobStore::blocksizeBytes() const {
+            return _baseBlobStore->blocksizeBytes();
+        }
+
         inline uint64_t CachingFsBlobStore::numBlocks() const {
             return _baseBlobStore->numBlocks();
         }
diff --git a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h b/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h
index 384eb2d3..cca1b3e4 100644
--- a/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h
+++ b/src/cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h
@@ -26,6 +26,7 @@ namespace cryfs {
             cpputils::unique_ref<SymlinkBlobRef> createSymlinkBlob(const boost::filesystem::path &target);
             boost::optional<cpputils::unique_ref<FsBlobRef>> load(const blockstore::Key &key);
             void remove(cpputils::unique_ref<FsBlobRef> blob);
+            uint64_t blocksizeBytes() const;
             uint64_t numBlocks() const;
             uint64_t estimateSpaceForNumBlocksLeft() const;
 
@@ -57,6 +58,10 @@ namespace cryfs {
             };
         }
 
+        inline uint64_t ParallelAccessFsBlobStore::blocksizeBytes() const {
+            return _baseBlobStore->blocksizeBytes();
+        }
+
         inline uint64_t ParallelAccessFsBlobStore::numBlocks() const {
             return _baseBlobStore->numBlocks();
         }