From 7e47e36e55017b1c00de8e667bdce74a4ffcc97d Mon Sep 17 00:00:00 2001
From: Vincent Dupont <vincent@otakeys.com>
Date: Fri, 28 Sep 2018 12:37:12 +0200
Subject: [PATCH] pkg/littlefs: fix file buffer size
---
examples/filesystem/Makefile | 2 +-
pkg/littlefs/fs/littlefs_fs.c | 5 +++++
sys/include/fs/littlefs_fs.h | 8 --------
tests/unittests/tests-littlefs/Makefile.include | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/examples/filesystem/Makefile b/examples/filesystem/Makefile
index 85b2d44363..f7c634529b 100644
--- a/examples/filesystem/Makefile
+++ b/examples/filesystem/Makefile
@@ -48,7 +48,7 @@ USEMODULE += constfs
# Set file systems specific variables
ifneq (,$(filter littlefs, $(USEMODULE)))
- CFLAGS += -DVFS_FILE_BUFFER_SIZE=52 -DVFS_DIR_BUFFER_SIZE=44
+ CFLAGS += -DVFS_FILE_BUFFER_SIZE=56 -DVFS_DIR_BUFFER_SIZE=44
else ifneq (,$(filter spiffs, $(USEMODULE)))
SPIFFS_NB_FD ?= 8
CFLAGS += '-DSPIFFS_FS_FD_SPACE_SIZE=(32 * $(SPIFFS_NB_FD))'
diff --git a/pkg/littlefs/fs/littlefs_fs.c b/pkg/littlefs/fs/littlefs_fs.c
index c0dfaf57b1..0d7d61294f 100644
--- a/pkg/littlefs/fs/littlefs_fs.c
+++ b/pkg/littlefs/fs/littlefs_fs.c
@@ -184,6 +184,11 @@ static int _format(vfs_mount_t *mountp)
static int _mount(vfs_mount_t *mountp)
{
+ /* if one of the lines below fail to compile you probably need to adjust
+ vfs buffer sizes ;) */
+ BUILD_BUG_ON(VFS_DIR_BUFFER_SIZE < sizeof(lfs_dir_t));
+ BUILD_BUG_ON(VFS_FILE_BUFFER_SIZE < sizeof(lfs_file_t));
+
littlefs_desc_t *fs = mountp->private_data;
DEBUG("littlefs: mount: mountp=%p\n", (void *)mountp);
diff --git a/sys/include/fs/littlefs_fs.h b/sys/include/fs/littlefs_fs.h
index ec90d67088..df25b0b331 100644
--- a/sys/include/fs/littlefs_fs.h
+++ b/sys/include/fs/littlefs_fs.h
@@ -31,14 +31,6 @@ extern "C" {
#include "mtd.h"
#include "mutex.h"
-#if VFS_FILE_BUFFER_SIZE < 52
-#error "VFS_FILE_BUFFER_SIZE is too small, at least 52 bytes is required"
-#endif
-
-#if VFS_DIR_BUFFER_SIZE < 44
-#error "VFS_DIR_BUFFER_SIZE is too small, at least 44 bytes is required"
-#endif
-
/**
* @name littlefs configuration
* @{
diff --git a/tests/unittests/tests-littlefs/Makefile.include b/tests/unittests/tests-littlefs/Makefile.include
index aa1928f832..b73373a734 100644
--- a/tests/unittests/tests-littlefs/Makefile.include
+++ b/tests/unittests/tests-littlefs/Makefile.include
@@ -1,6 +1,6 @@
USEMODULE += littlefs
# Set vfs file and dir buffer sizes
-CFLAGS += -DVFS_FILE_BUFFER_SIZE=52 -DVFS_DIR_BUFFER_SIZE=44
+CFLAGS += -DVFS_FILE_BUFFER_SIZE=56 -DVFS_DIR_BUFFER_SIZE=44
# Reduce LFS_NAME_MAX to 31 (as VFS_NAME_MAX default)
CFLAGS += -DLFS_NAME_MAX=31
--
GitLab