From 9610712ae4a793f50c30e8a45676f830cba09588 Mon Sep 17 00:00:00 2001 From: Amlal Date: Mon, 28 Apr 2025 19:32:21 +0200 Subject: dev, kernel: Fixed HeFS directory allocation routine. Signed-off-by: Amlal --- dev/kernel/FSKit/HeFS.h | 12 ++++++------ dev/kernel/FSKit/NeFS.h | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'dev/kernel/FSKit') diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h index a6fab1c5..feaee7bc 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -24,7 +24,7 @@ #define kHeFSFileNameLen (256U) #define kHeFSPartNameLen (128U) -#define kHeFSMinimumDiskSize (gib_cast(4)) +#define kHeFSMinimumDiskSize (mib_cast(16)) #define kHeFSDefaultVoluneName u8"HeFS Volume" @@ -108,7 +108,7 @@ struct PACKED HEFS_BOOT_NODE final { /// Drive, etc). Kernel::UInt8 fEncoding; /// @brief Encoding of the filesystem. (UTF-8, UTF-16, etc). Kernel::UInt64 fStartIND; /// @brief Start of the INode tree. - Kernel::UInt64 fEndIND; /// @brief End of the INode tree. + Kernel::UInt64 fEndIND; /// @brief End of the INode tree. it is used to track down the last ind offset. Kernel::UInt64 fINDCount; /// @brief Number of leafs in the INode tree. Kernel::UInt64 fDiskSize; /// @brief Size of the disk. (Could be a virtual size, that is not the /// real size of the disk.) @@ -116,10 +116,10 @@ struct PACKED HEFS_BOOT_NODE final { Kernel::UInt16 fDiskFlags; /// @brief Flags of the disk. (read-only, read-write, etc). Kernel::UInt16 fVID; /// @brief Virtual Identification Number within an EPM disk. (0xFFFF if not used). - Kernel::UInt64 fReserved; /// @brief Reserved for future use. - Kernel::UInt64 fReserved2; /// @brief Reserved for future use. - Kernel::UInt64 fReserved3; /// @brief Reserved for future use. - Kernel::UInt64 fReserved4; /// @brief Reserved for future use. + Kernel::UInt64 fStartIN; /// @brief Reserved for future use. + Kernel::UInt64 fEndIN; /// @brief Reserved for future use. + Kernel::UInt64 fReserved; /// @brief Reserved for future use. + Kernel::UInt64 fReserved1; /// @brief Reserved for future use. Kernel::Char fPad[272]; }; diff --git a/dev/kernel/FSKit/NeFS.h b/dev/kernel/FSKit/NeFS.h index 2235ca4f..588cbe69 100644 --- a/dev/kernel/FSKit/NeFS.h +++ b/dev/kernel/FSKit/NeFS.h @@ -108,7 +108,7 @@ default. #define kNeFSFlagCreated (71) #define kNeFSMimeNameLen (200) -#define kNeFSForkNameLen (200) +#define kNeFSForkNameLen (199) #define kNeFSFrameworkExt ".fwrk/" #define kNeFSStepsExt ".step/" @@ -200,8 +200,6 @@ struct PACKED NEFS_FORK_STRUCT final { Kernel::Lba NextSibling; Kernel::Lba PreviousSibling; - - Kernel::Char Pad[2] = {0}; }; /// @brief Partition block type -- cgit v1.2.3