aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-04-01 16:08:53 +0200
committerDan Engelbrecht <[email protected]>2022-04-01 16:08:53 +0200
commit345cf462e89ba37867abe4c0722ce2549dddc4ca (patch)
tree570dc1438995d091b180c0792a20f50e639df87c
parentmake sure we allocate disk space when we set file size (diff)
downloadzen-345cf462e89ba37867abe4c0722ce2549dddc4ca.tar.xz
zen-345cf462e89ba37867abe4c0722ce2549dddc4ca.zip
linux fixes
-rw-r--r--zenserver/cache/structuredcachestore.cpp4
-rw-r--r--zenstore/basicfile.cpp2
-rw-r--r--zenstore/include/zenstore/caslog.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index eec548f1b..79bb8486e 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -60,8 +60,8 @@ SaveCompactBinaryObject(const fs::path& Path, const CbObject& Object)
}
ZenCacheStore::ZenCacheStore(CasGc& Gc, const std::filesystem::path& RootDir)
-: m_RootDir(RootDir)
-, GcStorage(Gc)
+: GcStorage(Gc)
+, m_RootDir(RootDir)
, GcContributor(Gc)
, m_DiskLayer(RootDir)
{
diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp
index 93d4ded13..8b3ee2844 100644
--- a/zenstore/basicfile.cpp
+++ b/zenstore/basicfile.cpp
@@ -331,7 +331,7 @@ BasicFile::SetFileSize(uint64_t FileSize)
ftruncate(Fd, (off_t)FileSize);
posix_fallocate(Fd, 0, (off_t)FileSize);
#else
- posix_fallocate(Fd, 0, ) int Fd = int(intptr_t(m_FileHandle));
+ int Fd = int(intptr_t(m_FileHandle));
ftruncate64(Fd, (off64_t)FileSize);
posix_fallocate64(Fd, 0, (off64_t)FileSize);
#endif
diff --git a/zenstore/include/zenstore/caslog.h b/zenstore/include/zenstore/caslog.h
index 318fab03d..148837e35 100644
--- a/zenstore/include/zenstore/caslog.h
+++ b/zenstore/include/zenstore/caslog.h
@@ -83,7 +83,7 @@ public:
CasLogFile::Append(&Record, sizeof Record);
}
- void Append(const std::span<T>& Records) { CasLogFile::Append(Records.data(), sizeof T * Records.size()); }
+ void Append(const std::span<T>& Records) { CasLogFile::Append(Records.data(), (sizeof T) * Records.size()); }
};
} // namespace zen