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

Fixed small inaccuracy in calculation of free space in statvfs

Browse Source
This commit is contained in:
Sebastian Messmer 2022-12-25 19:14:21 +01:00
parent 6795d2bc6f
commit f5b50f348c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -2,6 +2,7 @@ Version 0.12.0 (unreleased)
--------------- ---------------
* Updated to DokanY 1.3.0.1000 * Updated to DokanY 1.3.0.1000
* Added a man page for `cryfs-unmount` * Added a man page for `cryfs-unmount`
* Fixed small inaccuracy in calculation of free space in statvfs
Version 0.11.3 Version 0.11.3
--------------- ---------------

6
src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.cpp
View File

@ -23,7 +23,7 @@ namespace onblocks {
namespace datanodestore { namespace datanodestore {
DataNodeStore::DataNodeStore(unique_ref<BlockStore> blockstore, uint64_t physicalBlocksizeBytes) DataNodeStore::DataNodeStore(unique_ref<BlockStore> blockstore, uint64_t physicalBlocksizeBytes)
: _blockstore(std::move(blockstore)), _layout(_blockstore->blockSizeFromPhysicalBlockSize(physicalBlocksizeBytes)) { : _blockstore(std::move(blockstore)), _layout(_blockstore->blockSizeFromPhysicalBlockSize(physicalBlocksizeBytes)), _physicalBlockSizeBytes(physicalBlockSizeBytes) {
} }
DataNodeStore::~DataNodeStore() { DataNodeStore::~DataNodeStore() {
@ -127,11 +127,11 @@ uint64_t DataNodeStore::numNodes() const {
} }
uint64_t DataNodeStore::estimateSpaceForNumNodesLeft() const { uint64_t DataNodeStore::estimateSpaceForNumNodesLeft() const {
return _blockstore->estimateNumFreeBytes() / _layout.blocksizeBytes(); return _blockstore->estimateNumFreeBytes() / _physicalBlockSizeBytes;
} }
uint64_t DataNodeStore::virtualBlocksizeBytes() const { uint64_t DataNodeStore::virtualBlocksizeBytes() const {
return _layout.blocksizeBytes(); return _layout.maxBytesPerLeaf();
} }
DataNodeLayout DataNodeStore::layout() const { DataNodeLayout DataNodeStore::layout() const {

1
src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.h
View File

@ -57,6 +57,7 @@ private:
cpputils::unique_ref<blockstore::BlockStore> _blockstore; cpputils::unique_ref<blockstore::BlockStore> _blockstore;
const DataNodeLayout _layout; const DataNodeLayout _layout;
uint64_t _physicalBlockSizeBytes;
DISALLOW_COPY_AND_ASSIGN(DataNodeStore); DISALLOW_COPY_AND_ASSIGN(DataNodeStore);
}; };